OSDN Git Service

am 7bdfa52d: vold: cryptfs: Don\'t update KDF without validating pwd/key.
authorJP Abgrall <jpa@google.com>
Fri, 15 Nov 2013 22:21:32 +0000 (14:21 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 15 Nov 2013 22:21:32 +0000 (14:21 -0800)
* commit '7bdfa52d934465e2182e2f1c200c4d8581ad5da6':
  vold: cryptfs: Don't update KDF without validating pwd/key.


Trivial merge