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:
ad0eb9d
c152fc1
)
Merge \"Update semantics of on-body Keystore API.\" into nyc-dev
author
Shawn Willden
<swillden@google.com>
Wed, 15 Jun 2016 14:54:43 +0000
(14:54 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 15 Jun 2016 14:54:43 +0000
(14:54 +0000)
am:
c152fc15a9
Change-Id: Icf116ed3d722eede02e743a4559ff684a36a82e0
Trivial merge