| commit | d75675da3f846a490566a8c81843794d07fd68b7 | [log] [tgz] |
|---|---|---|
| author | Joe Onorato <joeo@android.com> | Tue Sep 28 17:40:23 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 28 17:40:23 2010 -0700 |
| tree | 6948868fce1e6ea9301a77e49d9880f8df2e7449 | |
| parent | f547a54886fba6bdca344b4af711587e26242f01 [diff] | |
| parent | 1b82e8a1a256aa050290c4900c5f65247ba4e183 [diff] |
am f5bdeba1: am ea2cf2f9: Merge "Check for the DEVICE_POWER permission in userActivity." into gingerbread Merge commit 'f5bdeba197aba659e2dd3849a5bdfba8826c036d' * commit 'f5bdeba197aba659e2dd3849a5bdfba8826c036d': Check for the DEVICE_POWER permission in userActivity.