OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5c7a3e4
68b98bc
)
Merge \"docs: Added note about limited support for hardware key attestation\" into...
author
Kevin Hufnagle
<khufnagle@google.com>
Fri, 15 Jul 2016 18:56:32 +0000
(18:56 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 15 Jul 2016 18:56:32 +0000
(18:56 +0000)
am:
68b98bc608
Change-Id: I07e7c0a91f7e75d5713b93aa27c06ef2631ea276
Trivial merge