tree d0f9cd06c9da12a52a9e6f2311a9b4eaa9e5c497
parent 49dae8a7e774148acd32c3ee599a884b14cadbc9
parent 09ed308945358e97dcb0caa307c3e9566b4b1bf1
author Joe Onorato <joeo@android.com> 1286830515 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1286830515 -0700

am 446547af: Merge "Don\'t throw when userActivity fails because of the permission check." into gingerbread

Merge commit '446547af37fd10142f15f6a9b3ac3007c6473981' into gingerbread-plus-aosp

* commit '446547af37fd10142f15f6a9b3ac3007c6473981':
  Don't throw when userActivity fails because of the permission check.