tree a43843a82cf59469944a6a31eb96cbf4c2a25726
parent 502dc74153397e56d5410f8a8250b5581643b9ef
parent 86697c72ae29661ad64cfd7b134fa3d3215e0cc3
author Jeff Sharkey <jsharkey@android.com> 1384231911 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384231911 -0800

am 86697c72: am 6bcd362e: Handle missing UUID/LABEL from blkid.

* commit '86697c72ae29661ad64cfd7b134fa3d3215e0cc3':
  Handle missing UUID/LABEL from blkid.