am f5bdeba1: am ea2cf2f9: Merge "Check for the DEVICE_POWER permission in...
am f5bdeba1: am ea2cf2f9: Merge "Check for the DEVICE_POWER permission in userActivity." into gingerbread
Merge commit 'f5bdeba1'
* commit 'f5bdeba1':
Check for the DEVICE_POWER permission in userActivity.