OSDN Git Service

Merge "Add editable_voicemail_number key to CarrierConfig" am: 25b64aad01 am: 2b7118f...
authorJordan Liu <jminjie@google.com>
Tue, 4 Oct 2016 19:07:55 +0000 (19:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 4 Oct 2016 19:07:55 +0000 (19:07 +0000)
am: 5ffaae6efe  -s ours

Change-Id: Ic06f90ff7616abc7eb4e2b3a09de582c3a7eef3b


Trivial merge