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

* commit '198297b495d975cd4889f5136cd69368bd319eed':
  Revert "Revert "Check for the DEVICE_POWER permission in userActivity.""
2010-09-29 22:13:21 -07:00
..