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