| commit | bd90a0d0ffa864d6b58a279d01b28fd7ffc3e958 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sat Sep 19 08:01:02 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 19 08:01:02 2020 +0000 |
| tree | ebbe61435bfb633412f0ea009061bd220538fd45 | |
| parent | 9e25089aee795ce4dcff98358bd986f1cb359f85 [diff] | |
| parent | 5ff5b3187ca3cf51ca841ec86d80b81ed2779000 [diff] |
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 48a84d855f am: 5d7f242557 -s ours am: d50cfa9b63 -s ours am: 5ff5b3187c -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: I07395bbd3c6d17c709d7506df657025e0306adc3