OSDN Git Service

[automerger skipped] Merge "[DO NOT MERGE] Implement key attestation using AndroidKey...
authorMartin Brabham <optedoblivion@google.com>
Wed, 13 Mar 2019 22:43:21 +0000 (15:43 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 13 Mar 2019 22:43:21 +0000 (15:43 -0700)
commitdf0d69c3c7c358469e8da261cd95807ff738b10d
tree95c921a60b6b37213f2b5bd601fe0f1759d1acd6
parentcba64f6708c0cc8b5b3a1aee923bec206bae47c5
parent9eddaabde95ea4ef14dcaee197643832bddd1553
[automerger skipped] Merge "[DO NOT MERGE] Implement key attestation using AndroidKeystore." into pi-dev-plus-aosp
am: 9eddaabde9 -s ours
am skip reason: subject contains skip directive

Change-Id: I1847c3c4b7504b3995da132f14facae03f799542