| commit | 95e4eb59e41a222ddc29b5cb7a746d1348fdf1ed | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sat Sep 19 08:01:56 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 19 08:01:56 2020 +0000 |
| tree | ebbe61435bfb633412f0ea009061bd220538fd45 | |
| parent | bd90a0d0ffa864d6b58a279d01b28fd7ffc3e958 [diff] | |
| parent | 379ae6c7b8c8d150058b3f61906bdd5beca2612d [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 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: Ia188911bc5dffe63a0dc7a576314efecb1b5ba05