summaryrefslogtreecommitdiff
path: root/libs/rs/rsProgram.cpp
diff options
context:
space:
mode:
author Joe Onorato <joeo@android.com> 2010-09-28 17:22:09 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-09-28 17:22:09 -0700
commitf5bdeba197aba659e2dd3849a5bdfba8826c036d (patch)
tree35b35a0328f7587a324fbc62207b98a08b391d8f /libs/rs/rsProgram.cpp
parent08a02039ee467b3ead2c2e6d3f687b9c70c7fbc8 (diff)
parentea2cf2f936b03f1720bc43863e41c89ea2a7903a (diff)
am ea2cf2f9: Merge "Check for the DEVICE_POWER permission in userActivity." into gingerbread
Merge commit 'ea2cf2f936b03f1720bc43863e41c89ea2a7903a' into gingerbread-plus-aosp * commit 'ea2cf2f936b03f1720bc43863e41c89ea2a7903a': Check for the DEVICE_POWER permission in userActivity.
Diffstat (limited to 'libs/rs/rsProgram.cpp')
0 files changed, 0 insertions, 0 deletions