tree 7464c387291db9606b2d28db87413806ca335d40
parent ece855c21d5f21603edf7a67c56181502857b1df
parent 10939ac7e8c9fd141f45f1d6d82c78d5f5f5319c
author Jeff Sharkey <jsharkey@android.com> 1382061206 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1382061206 -0700

am 10939ac7: Merge "Extract UUID and label from inserted volumes." into klp-dev

* commit '10939ac7e8c9fd141f45f1d6d82c78d5f5f5319c':
  Extract UUID and label from inserted volumes.