| commit | 90ba8b743ee2c879ce80d9b8c0d8d258604e8202 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sat Sep 19 07:01:25 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 19 07:01:25 2020 +0000 |
| tree | 8f4cab55517362faedad66c4ee3396f8b5161259 | |
| parent | 0b754492ac0309b532174b48c7ae9f5d25eb4af2 [diff] | |
| parent | e1d6cd570cbba75dd141bbc8346a7a71809cdeb4 [diff] |
[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 8c7f330e7a am: 6dbeee66e9 -s ours am: e1d6cd570c -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: I18f6dabacb6e272e2d3fdf63a9220afc5572f2d2