| commit | 847cfb2230b7692f99521ba58d644ffbea397a97 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sat Sep 19 05:50:36 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 19 05:50:36 2020 +0000 |
| tree | a04fceb8f132ee498e860bf018efe7d14234240d | |
| parent | f2deca5759a7b472f1f0a43204dd0ad4d34d1394 [diff] | |
| parent | 1848cf03d8bbd35ef2ed6f75ee1d9c56ed60096c [diff] |
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 5b49c68d11 am: 1848cf03d8 -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: I4a14d0f2ef305f4f564e7e38134763a85fd09ad3