| commit | 379ae6c7b8c8d150058b3f61906bdd5beca2612d | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sat Sep 19 07:01:22 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 19 07:01:22 2020 +0000 |
| tree | 0d47ba608a68b26430e7f0c0e62132e5d62f7a76 | |
| parent | 5ff5b3187ca3cf51ca841ec86d80b81ed2779000 [diff] | |
| parent | 657e0f30081a35acc11bce559a46f1d4dc9ca652 [diff] |
[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 94c8353286 am: e7038aa1a3 -s ours am: 657e0f3008 -s ours am skip reason: Change-Id Ifa4dc400eb8c87c2514a3629288657520476fbfd with SHA-1 ccc406381a is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1430073 Change-Id: I9bffdf82e1739f2d962e3f5b5aa5369a45d0533b