commit | 3fd1488575470e77fc9fff3ef1e1dadb75b67ca8 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Sep 11 00:40:25 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 00:40:25 2020 +0000 |
tree | 93001b12af3bd84da990fd3ed9e65c055cc80db6 | |
parent | ada75ad54da56b459a82d9e731142c58dbdfb177 [diff] | |
parent | 36cfa7db8e3b8885b20d4a25587a4e4627c1d4aa [diff] |
[automerger skipped] Merge "Merge Android R" am: 36cfa7db8e -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: Ie39f3baca4e2059d4e4e1db1a65dd42137223b9d