tree 77631eb9ef327dd26423f5084233d935fe245fa1
parent c73341006286c391ae4d268a77f5e008045d5308
parent 53619434ed56043841256dfb2074662dbd0acc5e
author Jeff Sharkey <jsharkey@android.com> 1382028029 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1382028029 -0700

am 53619434: Merge "Add blkid to all builds for use by vold." into klp-dev

* commit '53619434ed56043841256dfb2074662dbd0acc5e':
  Add blkid to all builds for use by vold.