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:
3dbb583
a7bdb6c
)
am a7bdb6c9: Merge "KeyChain: annotate with @WorkerThread" into mnc-dev
author
Robin Lee
<rgl@google.com>
Fri, 3 Jul 2015 16:57:39 +0000
(16:57 +0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Fri, 3 Jul 2015 16:57:39 +0000
(16:57 +0000)
* commit '
a7bdb6c99b7ddb6e17f9c939c138686e0bfdbbc4
':
KeyChain: annotate with @WorkerThread
Trivial merge