diff options
| author | Joe Onorato <joeo@android.com> | 2010-09-29 11:02:55 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-29 11:02:55 -0700 |
| commit | 198297b495d975cd4889f5136cd69368bd319eed (patch) | |
| tree | dd3e822c61014e0f751069a133b8c8e9a2576204 /graphics/java/android/renderscript/RenderScript.java | |
| parent | b4a28f24263fbccce4b77b47c2f3ddac63a8a75f (diff) | |
| parent | f01a873029641da2155ca1882f311d8f4e92675a (diff) | |
am f01a8730: Merge "Revert "Revert "Check for the DEVICE_POWER permission in userActivity.""" into gingerbread
Merge commit 'f01a873029641da2155ca1882f311d8f4e92675a' into gingerbread-plus-aosp
* commit 'f01a873029641da2155ca1882f311d8f4e92675a':
Revert "Revert "Check for the DEVICE_POWER permission in userActivity.""
Diffstat (limited to 'graphics/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions