OSDN Git Service

am da6e899f: Add keymaster1 support to vold.
authorShawn Willden <swillden@google.com>
Wed, 17 Jun 2015 21:07:23 +0000 (21:07 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 17 Jun 2015 21:07:23 +0000 (21:07 +0000)
* commit 'da6e899f4e1429add2ef023e0cc6b0fcca42c945':
  Add keymaster1 support to vold.


Trivial merge