OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3c56d45 f3e5611)
am f3e5611c: am 1d050220: am 3ef52587: resolved conflicts for merge of 46c7f6d6 to...
authorJim Miller <jaggies@google.com>
Wed, 15 Oct 2014 21:17:23 +0000 (21:17 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Oct 2014 21:17:23 +0000 (21:17 +0000)
* commit 'f3e5611c54a686438a94365924b8a9ff76cbb793':
  Add a checkbox option to 'require password to decrypt'


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