tree 9d1c95ef90ad9a6cadbccd60eb37168754cdb3b9
parent 86697c72ae29661ad64cfd7b134fa3d3215e0cc3
parent 7bdfa52d934465e2182e2f1c200c4d8581ad5da6
author JP Abgrall <jpa@google.com> 1384554092 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384554092 -0800

am 7bdfa52d: vold: cryptfs: Don\'t update KDF without validating pwd/key.

* commit '7bdfa52d934465e2182e2f1c200c4d8581ad5da6':
  vold: cryptfs: Don't update KDF without validating pwd/key.