OSDN Git Service

[automerger skipped] Merge "Revert "[DO NOT MERGE] Implement key attestation using...
authorMyles Watson <mylesgw@google.com>
Wed, 13 Mar 2019 23:35:18 +0000 (16:35 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 13 Mar 2019 23:35:18 +0000 (16:35 -0700)
commit4a202c8ed6e458fc43453be2e356769704423ed8
tree95c921a60b6b37213f2b5bd601fe0f1759d1acd6
parentdf0d69c3c7c358469e8da261cd95807ff738b10d
parenta20390b7ac62724734044780808a53ec5b318241
[automerger skipped] Merge "Revert "[DO NOT MERGE] Implement key attestation using AndroidKeystore."" into pi-dev-plus-aosp
am: a20390b7ac -s ours
am skip reason: subject contains skip directive

Change-Id: I231f0b0853d19bd243a7fc63b984538e8d62f7fd