tree 17c8016b9432e8a0f7697c6f18a75c2333340a84
parent abcf4c6fca01c92cd8b4dd581488ede684efea71
parent 0a7e668ebf7215fbb89837e251f3f73a124adada
author Kenny Root <kroot@google.com> 1446830579 +0000
committer android-build-merger <android-build-merger@google.com> 1446830579 +0000

Merge "system/vold: check return value of PKCS5_PBKDF2_HMAC_SHA1."
am: 0a7e668ebf

* commit '0a7e668ebf7215fbb89837e251f3f73a124adada':
  system/vold: check return value of PKCS5_PBKDF2_HMAC_SHA1.