tree e934893ce824f6045030db5400746560317de948
parent 7f25ad62b0fff3fcce0ce78461ac7b46701da78a
parent 15369c6c3ba50a852ed0c499eb5929436cffa005
author Jeff Sharkey <jsharkey@android.com> 1436312950 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436312950 +0000

am 15369c6c: Merge "Fix volume naming when surfaced over MTP." into mnc-dev

* commit '15369c6c3ba50a852ed0c499eb5929436cffa005':
  Fix volume naming when surfaced over MTP.