commit | 72375f9bcdc4605894987e4f635aa9eafd7b5154 | [log] [tgz] |
---|---|---|
author | Shuo Qian <shuoq@google.com> | Wed Dec 23 02:00:05 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Dec 23 02:00:05 2020 +0000 |
tree | 0d33b2eb0b99bf70924d14143d9f1aa10e8e1114 | |
parent | b08a9e432a7d5ab0ce7ce269dd82671e6a265df4 [diff] | |
parent | 9bcf079a9ca06bef7522dea9707c17d39bbd6ae9 [diff] |
[automerger skipped] Merge "Fix ConcurrentModificationException of getEmergencyNumberList" am: dbee5f7446 am: 7a9c93d3d2 am: 9bcf079a9c -s ours am skip reason: Change-Id I5812469dfb96f30b5b185fc1bb983e3357bb4efa with SHA-1 f4ded970a7 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1533851 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic147a04aec1667b1479a9b467e2ef40db623761e