tree 63e8afd507e577d705bc60bb4e15ed8e7c26704c
parent b31f33b5e41bf295705b8f0c1582c6277e8fec64
parent 099b20f3ce42a49ba49a1a70a818047ea59612ad
author JP Abgrall <jpa@google.com> 1401218887 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1401218887 +0000

am 099b20f3: am 1881395b: am c6752b06: Merge "vold: wildcard support for device path matching"

* commit '099b20f3ce42a49ba49a1a70a818047ea59612ad':
  vold: wildcard support for device path matching