| commit | fb437d54d989fc4dc72bf339c569d671436c8b06 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu Dec 10 03:46:48 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 10 03:46:48 2020 +0000 |
| tree | 93c8cb451db2340e48c5c324f4ae5fe9ac08278a | |
| parent | 317aa9e772e16ebd8648cfaea0931300653d85a7 [diff] | |
| parent | ee06524dbef64e43dbab6690a088a6913653a1a4 [diff] |
[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 6e252c4cd5 -s ours am: ee06524dbe -s ours am skip reason: Change-Id Id2d9c4f56beae280e6299b6695185577a1521345 with SHA-1 07ccb42665 is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1521297 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9b33cb519a95d18ba7d64d90db3b10e3a9afe211