tree 5c3362b1a89ebe26bbc4e4cb52800a11c6bc521e
parent 4b4f6a36612e1274662c56412ea4410ccf03429f
parent d2de99e377408dc28dca5e4c61a816879595fbf3
author Steve Howard <showard@google.com> 1284593550 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1284593550 -0700

am d2de99e3: am 536ee090: Merge "Fix name shadowing bug with revoking URI permissions." into gingerbread

Merge commit 'd2de99e377408dc28dca5e4c61a816879595fbf3'

* commit 'd2de99e377408dc28dca5e4c61a816879595fbf3':
  Fix name shadowing bug with revoking URI permissions.