tree fb3a025eb63fc28978046e1cf18269eacfd90541
parent d752e24917c5feaa888327802cd4723141428c12
parent 4d6abcf29caa73462ffcc49a3cdaa27e8943b2e9
author Dianne Hackborn <hackbod@google.com> 1285698914 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285698914 -0700

am 4d6abcf2: Merge "Add tests for granting URIs with path-based permissions." into gingerbread

Merge commit '4d6abcf29caa73462ffcc49a3cdaa27e8943b2e9' into gingerbread-plus-aosp

* commit '4d6abcf29caa73462ffcc49a3cdaa27e8943b2e9':
  Add tests for granting URIs with path-based permissions.