| commit | 5ff5b3187ca3cf51ca841ec86d80b81ed2779000 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sat Sep 19 07:00:56 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 19 07:00:56 2020 +0000 |
| tree | 0d47ba608a68b26430e7f0c0e62132e5d62f7a76 | |
| parent | 15c3938b963df2fda8c865eba89acdc86ca337eb [diff] | |
| parent | d50cfa9b63bd26ff6f8545a3ff074117a3aacc46 [diff] |
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 48a84d855f am: 5d7f242557 -s ours am: d50cfa9b63 -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: I208048eb3581ea9f380b6e51a8f253106e942ece