| commit | d7b0884016ebc51cfba06b4da49a5a67b874f60e | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sat Sep 19 08:01:01 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 19 08:01:01 2020 +0000 |
| tree | 63239649afafb4e2d08f1ee61b519f5b11839151 | |
| parent | 9beab9d0931fc62e0517624540f068713bdec107 [diff] | |
| parent | e76e047fd65468947a3f02b7202f299bf20c25a5 [diff] |
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 50a06620fd am: 07c31ea202 -s ours am: 33e0adeb65 -s ours am: e76e047fd6 -s ours am skip reason: Change-Id Icf0f336dc246f35ddeb551e2db7a94ce79d5522b with SHA-1 2a2b9607d0 is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/1430119 Change-Id: Iab863ea144be4308a4ccd67cf51b4f82075423c4