summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2011-08-12 13:16:21 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-08-12 13:16:21 -0700
commit501f6256bb0046e040f9567afa29b44d4a21956a (patch)
tree42326f0f3d84236a13917882c8d0ee48074faa8c /opengl/tests/gl_basic/gl_basic.cpp
parent3e80266158fe2608d8aa905728749b61e4e5107c (diff)
parent23f1724cf7216f6c1f58e5689034aba966e0f38b (diff)
am 4dbd1bc6: am 5f074067: am 712a8cca: Merge "VolumePreference.onActivityStop only stops playback"
* commit '4dbd1bc6ae84cb4d0cd28922e917473ec6e53517': VolumePreference.onActivityStop only stops playback
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions