OSDN Git Service

am 3ef52587: resolved conflicts for merge of 46c7f6d6 to lmp-sprout-dev
authorJim Miller <jaggies@google.com>
Wed, 15 Oct 2014 21:02:09 +0000 (21:02 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Oct 2014 21:02:09 +0000 (21:02 +0000)
commit1d050220a0564b02bc1f4c33c5984a684a47bfa5
treee98f89146de3faab446e320b0e096aeba1b537ad
parent5e91648077f8f0765aa8628d0e99accfe2f87383
parent3ef52587da6fd91fc12164fd57100d6e352508ec
am 3ef52587: resolved conflicts for merge of 46c7f6d6 to lmp-sprout-dev

* commit '3ef52587da6fd91fc12164fd57100d6e352508ec':
  Add a checkbox option to 'require password to decrypt'
res/values/strings.xml