diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-06-09 10:19:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-09 10:19:14 -0700 |
| commit | 2efdc93e3529a7db98eb397f60bf236c047d5244 (patch) | |
| tree | 3b95fad964a5ac86852adf85eb49d3e17d1c5315 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | dbd950b87a8cc53d905233c443097d1e0728f3ed (diff) | |
| parent | 47345418926aa119cf7e2181d69aadc94d51548f (diff) | |
am 8ee28811: Merge changes Idbb70f53,I10426a3f into honeycomb-mr2
* commit '8ee28811ad208d224ac8d317e4644aabc9ffb886':
Merge 06942bc4 from hc-mr1.
Merge 988eeeb5 from hc-mr1.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions