| commit | d4c2a2f18728651c3d4191654389886cab5bf2bb | [log] [tgz] |
|---|---|---|
| author | Joe Onorato <joeo@android.com> | Wed Sep 29 22:13:21 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 29 22:13:21 2010 -0700 |
| tree | 1bc18fb8c236ab87d2c3c3e9001931191ea34666 | |
| parent | da5917ec359eeee04f83672958c10891afe01f16 [diff] | |
| parent | 198297b495d975cd4889f5136cd69368bd319eed [diff] |
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.""