| commit | 10c930c4c0a400e38602087d4f26b331633e310f | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Mon Sep 21 08:27:58 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 21 08:27:58 2020 +0000 |
| tree | b873293adb7c660f4c6cd966a738b66db782d55e | |
| parent | 762d039b477d6c271cd99e70d54c5df911f2eb91 [diff] | |
| parent | 95e4eb59e41a222ddc29b5cb7a746d1348fdf1ed [diff] |
[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 94c8353286 am: e7038aa1a3 -s ours am: 657e0f3008 -s ours am: 379ae6c7b8 -s ours am: 95e4eb59e4 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1430073 Change-Id: Ice308fc954cd91aee945e410bebfeb673bfc4f9a