| commit | 07f1638973034fd672501f6af9a086e3baa7fcd2 | [log] [tgz] |
|---|---|---|
| author | Xin Li <[email protected]> | Fri Sep 11 21:27:43 2020 +0000 |
| committer | Automerger Merge Worker <[email protected]> | Fri Sep 11 21:27:43 2020 +0000 |
| tree | 637d93c8c6439990697bb2f6724b8edbd26e022b | |
| parent | be38b9749afd5a0886d0a284118c92acfe3377e3 [diff] | |
| parent | e8ba1a8ad7a6e41115c3acc28b7f6d8f5d463931 [diff] |
[automerger skipped] Merge "Merge Android R" am: 6bb06f419d -s ours am: 279a785709 -s ours am: 83bbd70c90 -s ours am: 7d3a27eb30 -s ours am: e8ba1a8ad7 -s ours am skip reason: Change-Id I6a250ac5f12e25e8ba2647836cc85312f53cade2 with SHA-1 6c4c6701ac is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/wilhelm/+/1422431 Change-Id: I4b2e85b461a9d2d3adbb919bffa7ae47fdec6819