Merge commit 'ea2cf2f936b03f1720bc43863e41c89ea2a7903a' into gingerbread-plus-aosp * commit 'ea2cf2f936b03f1720bc43863e41c89ea2a7903a': Check for the DEVICE_POWER permission in userActivity.
Merge commit 'ea2cf2f936b03f1720bc43863e41c89ea2a7903a' into gingerbread-plus-aosp * commit 'ea2cf2f936b03f1720bc43863e41c89ea2a7903a': Check for the DEVICE_POWER permission in userActivity.