am 198297b4: am f01a8730: Merge "Revert "Revert "Check for the DEVICE_POWER...
am 198297b4: am f01a8730: Merge "Revert "Revert "Check for the DEVICE_POWER permission in userActivity.""" into gingerbread
Merge commit '198297b4'
* commit '198297b4':
Revert "Revert "Check for the DEVICE_POWER permission in userActivity.""