OSDN Git Service
(root)
/
android-x86
/
packages-apps-Settings.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
265398e
47704d0
)
am 47704d08: am 43366b2c: Merge "Add KeyStore storage type to Settings UI"
author
Kenny Root
<kroot@google.com>
Fri, 29 Mar 2013 23:46:39 +0000
(16:46 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Fri, 29 Mar 2013 23:46:39 +0000
(16:46 -0700)
* commit '
47704d08b8756d78d426100b97a4fa81b81f12b3
':
Add KeyStore storage type to Settings UI
Trivial merge