tree 715d547d2502de8d04de0ec12233b3183ce62c99
parent 45732432a136fcb9eab9ab97d2929c2c913801f6
parent 1ff0d50cd87bff245325d9858c5df710ab238465
author Jeff Sharkey <jsharkey@google.com> 1440668407 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440668407 +0000

am 1ff0d50c: (-s ours) am 5db4cc8f: Merge "Handle volumes without visible paths." into mnc-dev

* commit '1ff0d50cd87bff245325d9858c5df710ab238465':