| commit | 72c4162bad6b1fe59aa0aae0d4ad76ae4e8d3962 | [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 | 1cdf2797ca6930b37cea2f5bcc682ed4d572a7be | |
| parent | 2bcfd77e3b4e32830e48f2d695cf0d3afc1fe4de [diff] | |
| parent | 7fe436bd3a0140fed209b58b07d42187a67a17b8 [diff] |
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 4c6dc6bbea am: b450e2e7e3 -s ours am: 953d2224f7 -s ours am: 7fe436bd3a -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