commit | 7749ff50bde74dc9311ce9b5f7dbdd24ac172e27 | [log] [tgz] |
---|---|---|
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 21:27:26 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 21:27:26 2020 +0000 |
tree | f196acc82e52093f713aed29c2d69c072be1c30d | |
parent | 921d50cf7d1b7b1cf2064ea49e9c460afe6d7950 [diff] | |
parent | b8a4702d1aaf1337dfadaa65ef1d746fb0939749 [diff] |
Merge "[automerger skipped] Merge "Merge Android R" am: cdb6b16dec -s ours am: 73e8629851 -s ours am: ff9fd7efc7 -s ours am: e07e372c02 -s ours" into rvc-qpr-dev-plus-aosp am: b8a4702d1a -s ours am skip reason: Change-Id I1428ead11c6c2d6fd107a014df0082fdbfa9ba8a with SHA-1 c83049d937 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1422430 Change-Id: I33ff64830099962fa4634967ba02495c42d42aa7