OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8745327 5ff2620)
am 5ff26209: am 6cd90f45: Merge "Don\'t show TrustAgent entries when no security...
authorJim Miller <jaggies@google.com>
Fri, 8 Aug 2014 00:57:11 +0000 (00:57 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 8 Aug 2014 00:57:11 +0000 (00:57 +0000)
* commit '5ff2620928084f1e206341bcf62d08b581c8cff5':
  Don't show TrustAgent entries when no security is enabled.


Trivial merge
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help