| commit | d50cfa9b63bd26ff6f8545a3ff074117a3aacc46 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sat Sep 19 05:50:34 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 19 05:50:34 2020 +0000 |
| tree | 8b84f4483ca37874e8dc41fe2a5dd7fb17373776 | |
| parent | ccc406381a672e079be2dd80f8d32268b1f3d9bf [diff] | |
| parent | 5d7f24255767cbc985198e15d5851088918461d9 [diff] |
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 48a84d855f am: 5d7f242557 -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: I4463fa09a3cc3cd986293a03a0cd8424cfa20a41