| commit | f01a873029641da2155ca1882f311d8f4e92675a | [log] [tgz] |
|---|---|---|
| author | Joe Onorato <joeo@android.com> | Wed Sep 29 11:00:14 2010 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Sep 29 11:00:14 2010 -0700 |
| tree | 8364f9d916b7125dc775eca69eb7e5ab449ddb70 | |
| parent | d146c233c570af3ee31d2e6ac44082571026d619 [diff] | |
| parent | 0c32c09cd3a99a7f397313048ecf9d4c5afaaa91 [diff] |
Merge "Revert "Revert "Check for the DEVICE_POWER permission in userActivity.""" into gingerbread