tree ae9b7dcbc8ee17221851cf70b687c4e9b8cfbcb4
parent 00312255d281cc85fbee45cefd6d7a9391105afe
parent 8ab79b716d6b672817d19bb6578cc1422dc45705
author Pengquan Meng <mpq@google.com> 1548747667 -0800
committer android-build-merger <android-build-merger@google.com> 1548747667 -0800

[automerger skipped] Merge "system API getSimLocale" am: 4afc5daa73 am: 3f750c2bbe
am: 8ab79b716d -s ours
am skip reason: change_id Ib7288b56ebec117295d524d76ea217a6572a9e76 with SHA1 5d3637b796 is in history

Change-Id: I9e03eaeee15c3e1f747af148ac16422d78c23c3b