tree b8dc8ca9142d357c2bff37b5b161a222a5559441
parent 4cc173e135d63bf1878dd853cef2950fdd678423
parent da6e899f4e1429add2ef023e0cc6b0fcca42c945
author Shawn Willden <swillden@google.com> 1434575243 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1434575243 +0000

am da6e899f: Add keymaster1 support to vold.

* commit 'da6e899f4e1429add2ef023e0cc6b0fcca42c945':
  Add keymaster1 support to vold.