OSDN Git Service

am 40698b76: am 898671f1: Merge "Update SecuritySettings to use SwitchPreference...
authorJim Miller <jaggies@google.com>
Tue, 12 Aug 2014 00:56:52 +0000 (00:56 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 12 Aug 2014 00:56:52 +0000 (00:56 +0000)
* commit '40698b76c4ea094f5ae8341563640080237d10b2':
  Update SecuritySettings to use SwitchPreference


Trivial merge