| commit | c5f6e724a4f45cb6212df3478777a58ba885b7e3 | [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 | 1cdf2797ca6930b37cea2f5bcc682ed4d572a7be | |
| parent | 953d2224f731989d40ccbacc61d7f9dcc9ee0dde [diff] | |
| parent | 24c8811399be6fd3620621ef746fc6ea7e78ed3a [diff] |
[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 5249616425 am: 24c8811399 -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