diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2011-11-22 15:29:52 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-22 15:29:52 -0800 |
commit | bcf7af299d8599994993e06e5a07c325408f1475 (patch) | |
tree | 7e9737937a8cf7b3400e12826d8593260ae10f6e /opengl/tests/gl_basic/gl_basic.cpp | |
parent | afbeafd548925771c5700ab6ae791a8246e4c29c (diff) | |
parent | 4273a3e0c347742f312eef2445781ddbd59a18cd (diff) |
am d49a56ce: am 1889bb49: Reconcile with ics-mr0-release
* commit 'd49a56ce6405021b84ad4616f31d03f97732128c':
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions