| commit | a486aae1f46d3d26c6182eed7229908049266382 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Sep 11 02:02:47 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 02:02:47 2020 +0000 |
| tree | 81446b03442f9c90d9179dc294b2bfa41bc8364d | |
| parent | f75d48d9f899f309e8233d28e6c95660a154758f [diff] | |
| parent | 3fd1488575470e77fc9fff3ef1e1dadb75b67ca8 [diff] |
[automerger skipped] Merge "Merge Android R" am: 36cfa7db8e -s ours am: 3fd1488575 -s ours am skip reason: Change-Id I7972af3db5cb995b4a7c4deb982eeef6c3dddaad with SHA-1 ada75ad54d is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1421782 Change-Id: I62c3578d5dd1ce64b95dd1b2e54e648a3f362676