tree b11de96f03aeae97ac4fd188f25a2c08c0fe85bc
parent 74a28d5f6d7567d0ac4b26ec6c6020b8fbb8f571
parent 9cea1138cf40bdbbb3ca93b0c82eaca360c7e3b5
author Paul Lawrence <paullawrence@google.com> 1433174327 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433174327 +0000

am 9cea1138: (-s ours) am b7f0702e: (-s ours) DO NOT MERGE Use default key permissions for ext4enc

* commit '9cea1138cf40bdbbb3ca93b0c82eaca360c7e3b5':
  DO NOT MERGE Use default key permissions for ext4enc
  DO NOT MERGE Simplify password checking logic