OSDN Git Service

Merge "The text on toast should be changed when remains 1 time for SIM lock input...
authorxiyuan.wang <xiyuan.wang@sony.com>
Tue, 23 Jan 2018 21:07:52 +0000 (21:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 23 Jan 2018 21:07:52 +0000 (21:07 +0000)
commit6407162f01db4cab600e548da3ccfb8cdf2b2998
tree2e0510bec290de3706dfde6607f41ab5cc3e3e21
parentcd08de069afd0ec5ff9dad230ac5a2d4d6ed2c62
parent15691a74b5739ea357e662ed37af7577a655a99e
Merge "The text on toast should be changed when remains 1 time for SIM lock input" am: 6e6b1e2079
am: 15691a74b5  -s ours

Change-Id: Ied52d7a7c8080177e4d45b35280ca13222c175d0