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:
e30ced0
6cd90f4
)
am 6cd90f45: Merge "Don\'t show TrustAgent entries when no security is enabled."...
author
Jim Miller
<jaggies@google.com>
Thu, 7 Aug 2014 22:29:33 +0000
(22:29 +0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Thu, 7 Aug 2014 22:29:33 +0000
(22:29 +0000)
* commit '
6cd90f45b7fb7324eef9d05ae38e0e26bfc934d5
':
Don't show TrustAgent entries when no security is enabled.
Trivial merge