OSDN Git Service

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)
commitf38b63c9137ac1eb11e30ff03553c88696813ec0
tree3cefa7c7d4033d47a62a8c4a829bf0bc86a44504
parent3c56d456ea4a6f0f5d642ba96f066740a268f485
parentf3e5611c54a686438a94365924b8a9ff76cbb793
am f3e5611c: am 1d050220: am 3ef52587: resolved conflicts for merge of 46c7f6d6 to lmp-sprout-dev

* commit 'f3e5611c54a686438a94365924b8a9ff76cbb793':
  Add a checkbox option to 'require password to decrypt'