| commit | 6fd4703c21701d9166c2f3ab68dfc0263cdcfc52 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sat Sep 19 08:02:00 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 19 08:02:00 2020 +0000 |
| tree | ce196d04c30403a0f52cd3cb4ce0facad76ae518 | |
| parent | 1f9f75b75fa6f2c902ef9cb7c6a676d217a370c7 [diff] | |
| parent | 399b1982beaba7b6990ddedea1c23b11622d5f97 [diff] |
[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 5e81d0d348 am: 62b5cc5dd0 -s ours am: 98318fb25e -s ours am: 399b1982be -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: I908bcb9330b0e2cf00374276e1d8e5fa3fc67fab