am 05e11050: am a25eabad: Merge "Revert "Check for the DEVICE_POWER permission...
am 05e11050: am a25eabad: Merge "Revert "Check for the DEVICE_POWER permission in userActivity."" into gingerbread
Merge commit '05e11050'
* commit '05e11050':
Revert "Check for the DEVICE_POWER permission in userActivity."