| commit | bb9dd18f366f8cc52e94a6e95ebfb7675e0e0597 | [log] [tgz] |
|---|---|---|
| author | Xin Li <[email protected]> | Thu Aug 27 18:23:31 2020 +0000 |
| committer | Automerger Merge Worker <[email protected]> | Thu Aug 27 18:23:31 2020 +0000 |
| tree | 4a01a662a3dd27b314a3aad3e75da15e37eb7d96 | |
| parent | 2dbf4daa4d6bfb486e44bbdbfe1315108aa48daf [diff] | |
| parent | 73d868a1be20ce7a40ee364c40195750a325ac4e [diff] |
[automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 73d868a1be -s ours am skip reason: Change-Id Ia85aa5b8d01660fe1a5cfe5a9e24d19348c7e741 with SHA-1 20ff6e0734 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ms-tpm-20-ref/+/12469628 Change-Id: I83eab08a69b3133703adc3159ce70b607d349726