summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorJaikumar Ganesh <jaikumarg@android.com>2011-06-06 12:56:55 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-06-06 12:56:55 -0700
commit6f027fecc10bfef4f8204e1ab2c84c1f456bc728 (patch)
tree23f458f7b2bf07089e03934403762efdce4f4e3b /opengl/tests/gl_basic/gl_basic.cpp
parentac953eef762d93002d473f3ac99fc2bc7c5fda9e (diff)
parent63a89d789f44575c6e8cd5df8214eb4c6f673936 (diff)
am 5aaed097: am 58ada2f3: am 94062517: Merge "Require bonding and encryption for PBAP server"
* commit '5aaed0970be451479a07b2423e709026dec6611b': Require bonding and encryption for PBAP server
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions