| commit | 1f9f75b75fa6f2c902ef9cb7c6a676d217a370c7 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sat Sep 19 08:01:04 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 19 08:01:04 2020 +0000 |
| tree | ce196d04c30403a0f52cd3cb4ce0facad76ae518 | |
| parent | 5505b28af8354f04d1112adee4bbd831555f48eb [diff] | |
| parent | 33956d2199ba986405818bf4fe78e6f1cdd3b631 [diff] |
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 8469743b49 am: 987f8eb664 -s ours am: 02da648e8a -s ours am: 33956d2199 -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: I53f6598e1a8f06322ee1ec7f5c5979d2ab01c05b