tree b11de96f03aeae97ac4fd188f25a2c08c0fe85bc
parent 7344a7b5afb4a2d4e1f131424a152deef7f49fc2
parent b7f0702ea6cc32c58540d596016c2dabd8ba3541
author Paul Lawrence <paullawrence@google.com> 1433173476 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433173476 +0000

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

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