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