| commit | 6f6158c057708755d5fddce4870cf90fc03e311c | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sat Sep 19 05:50:36 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 19 05:50:36 2020 +0000 |
| tree | b77f46cc1cf3c7902ca0a3b2e270b59a100530fc | |
| parent | 070f5fccef02b972717a458e3cdf7a3d579319c7 [diff] | |
| parent | 2e8a4f4fc2ea4bf72f0ef8ceeaf6f14db5601f5d [diff] |
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: b363d45769 am: 2e8a4f4fc2 -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: I4a14d0f2ef305f4f564e7e38134763a85fd09ad3