am 75eb78f0: (-s ours) am 1aab56ce: Merge "Implement granting of URI permissions from picker.  DO NOT MERGE." into gingerbread

Merge commit '75eb78f07311706f2e68af8b85d45cf2d313a76e'

* commit '75eb78f07311706f2e68af8b85d45cf2d313a76e':
  Implement granting of URI permissions from picker.  DO NOT MERGE.