am f01a8730: Merge "Revert "Revert "Check for the DEVICE_POWER permission in userActivity.""" into gingerbread

Browse Source

Merge commit 'f01a873029641da2155ca1882f311d8f4e92675a' into gingerbread-plus-aosp

* commit 'f01a873029641da2155ca1882f311d8f4e92675a':
  Revert "Revert "Check for the DEVICE_POWER permission in userActivity.""

...

This commit is contained in:

Joe Onorato 2010-09-29 11:02:55 -07:00 committed by Android Git Automerger

parent fb46cd118b 8a663231b1

commit b93f6bad12

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available