summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2010-09-21 10:52:27 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-21 10:52:27 -0700
commit6efdfa493616a50a2890f3f5e29872fc0c441526 (patch)
tree7d0f7ca035d28794849b31df6f339e41ce6bee2c /opengl/tests/gl_basic/gl_basic.cpp
parent7cabd289a18c560c13295996364141b52376f792 (diff)
parentacb57b13d726bf38868780a689113b603ee62cf9 (diff)
am 8d1513e1: Merge "Made audio effect control panel intents public." into gingerbread
Merge commit '8d1513e13c1e3d0142423570c0028e147bf0ea37' into gingerbread-plus-aosp * commit '8d1513e13c1e3d0142423570c0028e147bf0ea37': Made audio effect control panel intents public.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions