tree 6e6a19679b95dab9e9cbef300d13e933c68b7db0
parent a319aa800df36d40e1de453b64fd1e14573e6d80
parent 2b46774ff950270365238e12e4a336e2004500e2
author Jeff Sharkey <jsharkey@android.com> 1420831284 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1420831284 +0000

am 2b46774f: Merge "Guard against MountService throwing NPE." into lmp-mr1-dev

* commit '2b46774ff950270365238e12e4a336e2004500e2':
  Guard against MountService throwing NPE.