am b763a6dc: am 08cf57d7: Merge "Fixes to granting URI permissions - take into account path perms." into gingerbread

Merge commit 'b763a6dc41dcce76585c56657903ae72c5422ae1'

* commit 'b763a6dc41dcce76585c56657903ae72c5422ae1':
  Fixes to granting URI permissions - take into account path perms.