| commit | 279a7857095b3506858bc6d3b10b4eea48771338 | [log] [tgz] |
|---|---|---|
| author | Xin Li <[email protected]> | Fri Sep 11 00:40:33 2020 +0000 |
| committer | Automerger Merge Worker <[email protected]> | Fri Sep 11 00:40:33 2020 +0000 |
| tree | 637d93c8c6439990697bb2f6724b8edbd26e022b | |
| parent | 6c4c6701ac857f7a30431616da6bffd319f9ed12 [diff] | |
| parent | 6bb06f419dbda4813da9e6b2ff3b5c902b43412b [diff] |
[automerger skipped] Merge "Merge Android R" am: 6bb06f419d -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: Icdb4620998d3ba77037af1cb6ad962b059c8ce6e