OSDN Git Service

Merge "Fix error message shown when SIM PIN enable/disable fails" am: f29392303a...
authorYouming Ye <paulye@google.com>
Mon, 15 Oct 2018 18:41:46 +0000 (11:41 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 15 Oct 2018 18:41:46 +0000 (11:41 -0700)
commit792e6afc84ddb5413c7a96a82e56d7598829ce30
tree31b3685d017150033f66b02455de54e36f61ec6c
parent1d95218e49b559db6ac22855decf34c39ef4b7d0
parent6293483fce1ef1513708df7be84c392b5c5ad39d
Merge "Fix error message shown when SIM PIN enable/disable fails" am: f29392303a am: 8bac59265e
am: 6293483fce

Change-Id: I5b533e911f1185bb9fe1847701e333093b49926e
res/values/strings.xml
src/com/android/settings/IccLockSettings.java