diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-06-09 12:49:55 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-09 12:49:55 -0700 |
| commit | 01aa602b60401401db0b6c854efb2e31dd3f2a96 (patch) | |
| tree | f949892f9d4299de57cbfad53d96970f7cb51df1 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 50b034725b9295f650d7807706c746f03158d247 (diff) | |
| parent | 2efdc93e3529a7db98eb397f60bf236c047d5244 (diff) | |
am 2e0f7118: am 8ee28811: Merge changes Idbb70f53,I10426a3f into honeycomb-mr2
* commit '2e0f71181792780b55826bcc562ae79951e76f1b':
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