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