tree 691430f39399427cd774aa3bbf46562bb1fb05fb
parent 94163d3203647ac3941f27c79177a9232912b6de
parent 22e73205dfc889191979ed7953f2d61c9d61015e
author Jayachandran Chinnakkannu <jayachandranc@google.com> 1502345160 +0000
committer android-build-merger <android-build-merger@google.com> 1502345160 +0000

Merge "Do not translate "Wi-Fi calling" for VF DE" into oc-dr1-dev
am: 22e73205df

Change-Id: Idecb5217b92ced1bfd2364670ecfdb1ab0562ad6