tree 375b5c4651dbdc90e1e3d9ff428bc7e282d40720
parent 0272df85061304683a1fa9aa5825ba8dbf102841
parent e6063299d874cc3b9d1fa71d0c3772c6ebe62e06
author Dave Santoro <dsantoro@google.com> 1318548857 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1318548857 -0700

am e6063299: Merge "Add hidden API for pre-authorizing URIs." into ics-mr0

* commit 'e6063299d874cc3b9d1fa71d0c3772c6ebe62e06':
  Add hidden API for pre-authorizing URIs.