summaryrefslogtreecommitdiff
path: root/libs/rs/rsProgramVertex.cpp
diff options
context:
space:
mode:
author Mike Lockwood <lockwood@android.com> 2010-09-28 20:21:48 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-09-28 20:21:48 -0700
commit5d5bf48c9843231d55ded61f6ce50488ef280554 (patch)
treeec4c59a9fa7c15f79a23d73113fcec585008b0f8 /libs/rs/rsProgramVertex.cpp
parentd9bb688c91b5be6b7f065f02b9095787c452016e (diff)
parent05e110506156a1b782232833b907afb428802b69 (diff)
am 05e11050: am a25eabad: Merge "Revert "Check for the DEVICE_POWER permission in userActivity."" into gingerbread
Merge commit '05e110506156a1b782232833b907afb428802b69' * commit '05e110506156a1b782232833b907afb428802b69': Revert "Check for the DEVICE_POWER permission in userActivity."
Diffstat (limited to 'libs/rs/rsProgramVertex.cpp')
0 files changed, 0 insertions, 0 deletions