am ea2cf2f9: Merge "Check for the DEVICE_POWER permission in userActivity." into gingerbread

Merge commit 'ea2cf2f936b03f1720bc43863e41c89ea2a7903a' into gingerbread-plus-aosp

* commit 'ea2cf2f936b03f1720bc43863e41c89ea2a7903a':
  Check for the DEVICE_POWER permission in userActivity.
tree: 98c2aa54138fd908e08466ccfb8567ddb09e10bf
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE