| commit | be38b9749afd5a0886d0a284118c92acfe3377e3 | [log] [tgz] |
|---|---|---|
| author | Xin Li <[email protected]> | Wed Sep 02 01:59:36 2020 +0000 |
| committer | Automerger Merge Worker <[email protected]> | Wed Sep 02 01:59:36 2020 +0000 |
| tree | 637d93c8c6439990697bb2f6724b8edbd26e022b | |
| parent | 1a98093df3767815d8d2e81447ffa7a96a2c786b [diff] | |
| parent | 8c84f096b7ae541db1e49d6f7139ca9637a7b137 [diff] |
[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 6c4c6701ac -s ours am: a03cc2b7cb -s ours am: 5281311ad6 -s ours am: 8c84f096b7 -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: I5e079c9bdc9d83c4007546e9f89ebcc96f5f0d8f