OSDN Git Service
(root)
/
android-x86
/
system-bt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2288446
e0f1e9a
)
[automerger skipped] [DO NOT MERGE] Implement key attestation using AndroidKeystore.
author
Martin Brabham
<optedoblivion@google.com>
Fri, 22 Mar 2019 21:42:04 +0000
(14:42 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 22 Mar 2019 21:42:04 +0000
(14:42 -0700)
am:
e0f1e9a32c
-s ours
am skip reason: change_id I26de9ea05f515d6643a83d11628490fb49e10743 with SHA1
5f67e5ff1c
is in history
Change-Id: Ib043f2b93d95cb939c1cd2d853e00abfb284e09f
Trivial merge