OSDN Git Service

am f38b63c9: am f3e5611c: am 1d050220: am 3ef52587: resolved conflicts for merge...
authorJim Miller <jaggies@google.com>
Wed, 15 Oct 2014 21:23:51 +0000 (21:23 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Oct 2014 21:23:51 +0000 (21:23 +0000)
* commit 'f38b63c9137ac1eb11e30ff03553c88696813ec0':
  Add a checkbox option to 'require password to decrypt'

1  2 
AndroidManifest.xml
res/values/strings.xml

Simple merge
Simple merge