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.
tree: 1049acf697ef2fe83a12a74bbf426b864eba5ea6
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE