OSDN Git Service

Merge "String changes for Voice/Data/Emergency service blocked." into oc-dev am:...
authorSanket Padawe <sanketpadawe@google.com>
Tue, 28 Mar 2017 18:53:46 +0000 (18:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 28 Mar 2017 18:53:46 +0000 (18:53 +0000)
am: 813747fb15  -s ours

Change-Id: I9ca33d0f4bedc6c0303bd8bde8a4f7ae9c70cd24


Trivial merge