| commit | 33e0adeb658be093c6cdac5ca9e95463d6764dd9 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sat Sep 19 05:50:33 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 19 05:50:33 2020 +0000 |
| tree | 63239649afafb4e2d08f1ee61b519f5b11839151 | |
| parent | 2a2b9607d01ef9e2f882630ddca5c9cf4e124708 [diff] | |
| parent | 07c31ea20219aac67ef25792ee9b67b51314c599 [diff] |
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 50a06620fd am: 07c31ea202 -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: If4cbdf3866c71f1e5cf95a6cfffc34804d45e5db