summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2011-08-11 12:43:44 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-08-11 12:43:44 -0700
commit49934b48b3240267ec9378ea69d7fe04e7557f2d (patch)
tree5eae583b2d020e6a01b6718f9a21da035be70cea /opengl/tests/gl_basic/gl_basic.cpp
parent9f3a33a671bfbd13f27cdfc96b0e53cd3199b857 (diff)
parent431d7beafe0c825cafafe6966d02c95fa219c0e8 (diff)
am 712a8cca: Merge "VolumePreference.onActivityStop only stops playback"
* commit '712a8cca1f9e438af224f93c3a4644853331af2e': VolumePreference.onActivityStop only stops playback
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions