| commit | 6f4ae27e33d74676119a4b04c93b6c34eda9c211 | [log] [tgz] |
|---|---|---|
| author | Mike Lockwood <lockwood@android.com> | Tue Sep 28 20:18:36 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 28 20:18:36 2010 -0700 |
| tree | 98c2aa54138fd908e08466ccfb8567ddb09e10bf | |
| parent | 90d2e41eef7d57be8864faaa48af54b68ca24107 [diff] | |
| parent | a9bb4012233144c40499c78cbd5ca136d6502c38 [diff] |
am a25eabad: Merge "Revert "Check for the DEVICE_POWER permission in userActivity."" into gingerbread Merge commit 'a25eabad23d7b8fd430ada757ae4e9f2559f8845' into gingerbread-plus-aosp * commit 'a25eabad23d7b8fd430ada757ae4e9f2559f8845': Revert "Check for the DEVICE_POWER permission in userActivity."