| commit | 98318fb25e56cdd74300093109c2640e16dd40ea | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sat Sep 19 05:51:33 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 19 05:51:33 2020 +0000 |
| tree | ce196d04c30403a0f52cd3cb4ce0facad76ae518 | |
| parent | 02da648e8a59288dd4fe8fd743587b291ec3b66b [diff] | |
| parent | 62b5cc5dd06c4603e0989e0443e52ea667ae5b30 [diff] |
[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 5e81d0d348 am: 62b5cc5dd0 -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: I2ad75dfe2a2109ea63eade0ed3edc40b92149a16