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 17:59:04 +0000 (10:59 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 15 Oct 2018 17:59:04 +0000 (10:59 -0700)
commit6293483fce1ef1513708df7be84c392b5c5ad39d
treedd40662f6145417310adbb54ecc6d4a06c92c193
parent31398ce16532d6ffb8de0caebb0e0b4e39b8eaab
parent8bac59265e978fe59c51e455652e7194a9a26cba
Merge "Fix error message shown when SIM PIN enable/disable fails" am: f29392303a
am: 8bac59265e

Change-Id: If28ef5f32183918404896ed395a49c9c2d87067a
res/values/strings.xml