From: Jim Miller <jaggies@google.com>
Date: Wed, 15 Oct 2014 21:23:51 +0000 (+0000)
Subject: am f38b63c9: am f3e5611c: am 1d050220: am 3ef52587: resolved conflicts for merge... 
X-Git-Tag: android-x86-6.0-r1~1381
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=69cb6a9001a699657a6861daac9c771af8d80fd0;p=android-x86%2Fpackages-apps-Settings.git

am f38b63c9: am f3e5611c: am 1d050220: am 3ef52587: resolved conflicts for merge of 46c7f6d6 to lmp-sprout-dev

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

69cb6a9001a699657a6861daac9c771af8d80fd0