tree f9a0560b75d6a2a1d4b1b20bf3e50407bbc05f6c
parent 24fe22573ed6247c84919ade229aa58d7c6f23fe
parent d45a9f335a8a3a3313f07948759c83e576ddf4a7
author Jayachandran Chinnakkannu <jayachandranc@google.com> 1502345714 +0000
committer android-build-merger <android-build-merger@google.com> 1502345714 +0000

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

Change-Id: Ied816ce1e2431918898091a0ac68a47672958a6d