| commit | 19984fcbf0e662e50fad375060288f9487fb8bee | [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 | 8f4cab55517362faedad66c4ee3396f8b5161259 | |
| parent | 9b597de75be777c8a88023a9ec883016d61f21cf [diff] | |
| parent | 0b754492ac0309b532174b48c7ae9f5d25eb4af2 [diff] |
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 725af62a59 am: 1138d178c4 -s ours am: 9dce16d237 -s ours am: 0b754492ac -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