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