commit | 79a215ba26a52cdb763a8389e74b024837257ba0 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Thu Aug 27 18:54:25 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 27 18:54:25 2020 +0000 |
tree | 4a01a662a3dd27b314a3aad3e75da15e37eb7d96 | |
parent | afd50c057bab620469a9060cf688c8fae91b771b [diff] | |
parent | bb9dd18f366f8cc52e94a6e95ebfb7675e0e0597 [diff] |
[automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 73d868a1be -s ours am: bb9dd18f36 -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: Id302295260f59c4eaf86e474ec4cb918c3961cc7