diff options
| author | Joe Onorato <joeo@android.com> | 2010-09-28 17:40:23 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-28 17:40:23 -0700 |
| commit | 75a44c6196e19ef404be1eb3d61bfea2b23caf10 (patch) | |
| tree | 4df6db2cd8ccabeeec6b19f6291fde30a70453aa /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 3a7bbc4d58ba270a20692689e5ce8311100d3d72 (diff) | |
| parent | f5bdeba197aba659e2dd3849a5bdfba8826c036d (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.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions