summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2010-09-21 10:56:30 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-21 10:56:30 -0700
commit18fde01aa30c76432ff491455567ba0d33b7a3f8 (patch)
tree25d414048817d4a815150609c0ee56b358a0b4bb /opengl/tests/gl_basic/gl_basic.cpp
parent86372461a8556a879707ea31b08443e6db9a279c (diff)
parent6efdfa493616a50a2890f3f5e29872fc0c441526 (diff)
am 96d5c17e: am 8d1513e1: Merge "Made audio effect control panel intents public." into gingerbread
Merge commit '96d5c17e7828f1a5cbeb3d87e0146d145870558f' * commit '96d5c17e7828f1a5cbeb3d87e0146d145870558f': Made audio effect control panel intents public.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions