summaryrefslogtreecommitdiff
path: root/libs/rs/rsProgramVertex.cpp
diff options
context:
space:
mode:
author Mike Lockwood <lockwood@android.com> 2010-09-28 20:18:36 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-09-28 20:18:36 -0700
commit05e110506156a1b782232833b907afb428802b69 (patch)
treee146d2bfb011666cc799eb8a3ba6beebabe374cc /libs/rs/rsProgramVertex.cpp
parentebfe5632db275a89b49ab828064ba90db59702cf (diff)
parenta25eabad23d7b8fd430ada757ae4e9f2559f8845 (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."
Diffstat (limited to 'libs/rs/rsProgramVertex.cpp')
0 files changed, 0 insertions, 0 deletions