OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 288bb7b 1746d3a)
am 1746d3a7: am 6f2ca5bc: Merge "Show more security settings, and fix missing summary...
authorAmith Yamasani <yamasani@google.com>
Wed, 26 Sep 2012 18:51:57 +0000 (11:51 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 26 Sep 2012 18:51:57 +0000 (11:51 -0700)
* commit '1746d3a7346492a92ae1008eea33b26ffb8a1479':
  Show more security settings, and fix missing summary in widget selection.


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