commit | 5281311ad6af745dbea1dd243226e16864e7d6ef | [log] [tgz] |
---|---|---|
author | Xin Li <[email protected]> | Tue Sep 01 21:46:55 2020 +0000 |
committer | Automerger Merge Worker <[email protected]> | Tue Sep 01 21:46:55 2020 +0000 |
tree | 637d93c8c6439990697bb2f6724b8edbd26e022b | |
parent | b7a8315f4e6cde6bc5b3130e13d4eb860a74af35 [diff] | |
parent | a03cc2b7cbb0283fc36f215996beb8d7c852ffe0 [diff] |
[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 6c4c6701ac -s ours am: a03cc2b7cb -s ours am skip reason: Change-Id I30a2a3f5af794eaeaea2facee92e8a1dc196a249 with SHA-1 e492e57ef2 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/wilhelm/+/12470173 Change-Id: Ie5ab97d670d22fb452f6026fe2842aef4a583526