[automerger skipped] Merge "The text on toast should be changed when remains 1 time for SIM lock input" am: 37a0c3873f am: 4d01040160 -s ours am: f1dbf2bd5e -s ours am: e3cb875f3f -s ours am: d455229ab9 -s ours am: 9292ad91c9 -s ours

Browse Source

am skip reason: Change-Id If4b53bbbc6b51582bc0837abf4497d9a75ebbaad with SHA-1 9c69ded434 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1393239

Change-Id: I5c425ae84cff3646eec3c4ea9ae30fe700cb908e

...

This commit is contained in:

Bonian Chen

2020-08-07 08:08:25 +00:00

committed by Automerger Merge Worker

parent 3f3710dcb3 9292ad91c9

commit a45b7cedb3

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available