| commit | 02da648e8a59288dd4fe8fd743587b291ec3b66b | [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 | ce196d04c30403a0f52cd3cb4ce0facad76ae518 | |
| parent | 78d3a61273cea0c7be7748c55469e043602407fc [diff] | |
| parent | 987f8eb6640693f8a49e9398f485392425ff05d6 [diff] |
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 8469743b49 am: 987f8eb664 -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