am f01a8730: Merge "Revert "Revert "Check for the DEVICE_POWER permission in...
am f01a8730: Merge "Revert "Revert "Check for the DEVICE_POWER permission in userActivity.""" into gingerbread
Merge commit 'f01a8730' into gingerbread-plus-aosp
* commit 'f01a8730':
Revert "Revert "Check for the DEVICE_POWER permission in userActivity.""