| commit | 8aa4aa8104bdc44ee086d5519ef3c9e811e33a46 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <[email protected]> | Mon Sep 21 08:27:02 2020 +0000 |
| committer | Automerger Merge Worker <[email protected]> | Mon Sep 21 08:27:02 2020 +0000 |
| tree | d156436a56ef0edeb25b35e2b6b87561374ffafb | |
| parent | 02ab3ad2ad5ff08616e422ca89dc817acf4b567b [diff] | |
| parent | d7b0884016ebc51cfba06b4da49a5a67b874f60e [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: d7b0884016 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/1430119 Change-Id: I3753cec8a895dccd2550b00e8fb1b65ae2861fcc