OSDN Git Service

[automerger skipped] Revert "Revert "[DO NOT MERGE] Implement key attestation using...
authorMartin Brabham <optedoblivion@google.com>
Thu, 14 Mar 2019 00:05:32 +0000 (17:05 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 14 Mar 2019 00:05:32 +0000 (17:05 -0700)
am: 7f570f8673 -s ours
am skip reason: subject contains skip directive

Change-Id: If76546b534b8f7dd16763184cae2ee851de88bc9


Trivial merge