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:
ed5ce4a
7703ce2
)
Merge \\"docs: Added note about limited support for hardware key attestation\\" into...
author
Kevin Hufnagle
<khufnagle@google.com>
Fri, 15 Jul 2016 19:12:28 +0000
(19:12 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 15 Jul 2016 19:12:28 +0000
(19:12 +0000)
am:
7703ce2d21
Change-Id: I1ec301fa937ef74193667f43891d8e0e09737dfd
Trivial merge