OSDN Git Service

am 1d050220: am 3ef52587: resolved conflicts for merge of 46c7f6d6 to lmp-sprout-dev
authorJim Miller <jaggies@google.com>
Wed, 15 Oct 2014 21:13:41 +0000 (21:13 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Oct 2014 21:13:41 +0000 (21:13 +0000)
commitf3e5611c54a686438a94365924b8a9ff76cbb793
treee98f89146de3faab446e320b0e096aeba1b537ad
parent14d4f3defc0a361931decc7743fe9fe2b445b4e7
parent1d050220a0564b02bc1f4c33c5984a684a47bfa5
am 1d050220: am 3ef52587: resolved conflicts for merge of 46c7f6d6 to lmp-sprout-dev

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