| commit | 4c11750cfb5ab5fa58a10ad5deb976e921383242 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sat Sep 19 05:51:33 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 19 05:51:33 2020 +0000 |
| tree | b77f46cc1cf3c7902ca0a3b2e270b59a100530fc | |
| parent | 6f6158c057708755d5fddce4870cf90fc03e311c [diff] | |
| parent | 9975ba02cfdda4b83af68c2a0fdbe4ac8b242c58 [diff] |
[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 72459e4a0e am: 9975ba02cf -s ours am skip reason: Change-Id Id04ea331831e8b26ba99478848392b40a92548d5 with SHA-1 c54ab73ef9 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431515 Change-Id: I2ad75dfe2a2109ea63eade0ed3edc40b92149a16