| commit | 367916facc95cab8757b23a15b3196ba03d54eef | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sat Sep 19 05:50:35 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 19 05:50:35 2020 +0000 |
| tree | fd3f9d3d6fadbaee789c73fedb92f8ec8e7543df | |
| parent | 3fc3ad9888892d3cd11c8e74be280fcf15b4a378 [diff] | |
| parent | 077b8d9689e5d9c2e8ee713b149a9a522f27f69f [diff] |
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 6f4764cbe6 am: 077b8d9689 -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: I4a6cc56343dbb8e2856af9dbae17bce3840e6e08