| commit | 01a67bc8bc125fbd35002e8cdf16862b8c295671 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sat Sep 19 08:01:04 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 19 08:01:04 2020 +0000 |
| tree | 3bf38b41fc6a117795283a07789a619fe3efa763 | |
| parent | 7b3ecfcbeefa7a9406293cbe2a35e3be95235045 [diff] | |
| parent | e8d8e41c3f404f70e4585c27206b274688ea78d8 [diff] |
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 6f4764cbe6 am: 077b8d9689 -s ours am: 367916facc -s ours am: e8d8e41c3f -s ours am skip reason: Change-Id Icbe5e5b9cc8992118ea86aa9856c5d98406cc895 with SHA-1 3fc3ad9888 is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/SafetyRegulatoryInfo/+/1431523 Change-Id: Ia6cf5dccfce8db8f06bca717757882a00a116952