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:
5fdb8fa
b0c216d
)
am b0c216d3: Merge "Disambiguate categories in Settings > Trusted Credentials" into...
author
Zoltan Szatmary-Ban
<szatmz@google.com>
Wed, 1 Oct 2014 17:02:07 +0000
(17:02 +0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Wed, 1 Oct 2014 17:02:07 +0000
(17:02 +0000)
* commit '
b0c216d3b95b3aa3a0a38ebde92ec19956598e9d
':
Disambiguate categories in Settings > Trusted Credentials
Trivial merge