tree 3a3806bb7d12709c99ef925ebe25af34c899d73b
parent 8ae96707415b1739c8e05cfdcc77809f36f9a7c6
parent 68c20f53050e27b6cf6c2734d6cdd0bd69cbe608
author Nick Kralevich <nnk@google.com> 1370100241 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1370100241 -0700

am 68c20f53: am 1e5e03eb: FileSystemPermissionTest: handle non-standard mounts

* commit '68c20f53050e27b6cf6c2734d6cdd0bd69cbe608':
  FileSystemPermissionTest: handle non-standard mounts