tree 4aa1732d9fcb8ac175b8bb8a1bdc163f4e4c7d59
parent e8e1d80c64db85526a003e88c3dba36ff33dac74
parent 1d8e3ce8da962e5ff98d36e75f6b02873fdddb70
author Colin Cross <ccross@android.com> 1391808713 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1391808713 +0000

am 1d8e3ce8: Merge "vold: fix errors inside ALOGV"

* commit '1d8e3ce8da962e5ff98d36e75f6b02873fdddb70':
  vold: fix errors inside ALOGV