| commit | 0b754492ac0309b532174b48c7ae9f5d25eb4af2 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sat Sep 19 07:00:58 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 19 07:00:58 2020 +0000 |
| tree | 8f4cab55517362faedad66c4ee3396f8b5161259 | |
| parent | 4286c98bb14155b981c8fa9b29d0bdaacb14573d [diff] | |
| parent | 9dce16d2372c5a594590b033a65a399a6c86f592 [diff] |
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 725af62a59 am: 1138d178c4 -s ours am: 9dce16d237 -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: Ib3e8b5c0678513b5128aaf106c8f8044bed09702