| commit | 657e0f30081a35acc11bce559a46f1d4dc9ca652 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sat Sep 19 05:51:28 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 19 05:51:28 2020 +0000 |
| tree | 8b84f4483ca37874e8dc41fe2a5dd7fb17373776 | |
| parent | d50cfa9b63bd26ff6f8545a3ff074117a3aacc46 [diff] | |
| parent | e7038aa1a3315db523a4209b424ac9f0c4add35d [diff] |
[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 94c8353286 am: e7038aa1a3 -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: I0201d683bb94a0143cd81fa094993007aa7aad6d