summaryrefslogtreecommitdiff
path: root/libs/rs/rsProgramFragment.cpp
diff options
context:
space:
mode:
author Brett Chabot <brettchabot@android.com> 2009-11-25 13:16:19 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2009-11-25 13:16:19 -0800
commit2c860a0dfbce26a48cde7c16ebced6561c62f83a (patch)
tree4626138ed446d37615fbde7b6985f967f242ec7c /libs/rs/rsProgramFragment.cpp
parentf3ab5c6b32e682e94e6909ef427e1ac7381f0490 (diff)
parent92eaf4f0e2dc9ed8815e1ae040cb8fb91838bc47 (diff)
am 92eaf4f0: am 8f4fbc5c: am d782b4b6: Add keyguard permission to instrumented ImfTest package.
Merge commit '92eaf4f0e2dc9ed8815e1ae040cb8fb91838bc47' * commit '92eaf4f0e2dc9ed8815e1ae040cb8fb91838bc47': Add keyguard permission to instrumented ImfTest package.
Diffstat (limited to 'libs/rs/rsProgramFragment.cpp')
0 files changed, 0 insertions, 0 deletions