| commit | 83bbd70c90f3936e26c5ad8ec61b3f1430d5e85d | [log] [tgz] |
|---|---|---|
| author | Xin Li <[email protected]> | Fri Sep 11 02:02:52 2020 +0000 |
| committer | Automerger Merge Worker <[email protected]> | Fri Sep 11 02:02:52 2020 +0000 |
| tree | 637d93c8c6439990697bb2f6724b8edbd26e022b | |
| parent | a03cc2b7cbb0283fc36f215996beb8d7c852ffe0 [diff] | |
| parent | 279a7857095b3506858bc6d3b10b4eea48771338 [diff] |
[automerger skipped] Merge "Merge Android R" am: 6bb06f419d -s ours am: 279a785709 -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: Ife392282eee226c4817f4c1d5b279b11abcabccc