diff options
| author | Mathias Agopian <mathias@google.com> | 2010-12-07 23:00:20 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-12-07 23:00:20 -0800 |
| commit | c9a77126ad49e9a1e9607670b030c2f448b16e67 (patch) | |
| tree | 3162f410a33c201134f0b81f23bb777fb9f13d28 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 222ae987aab180b960aac382926c69458b5a2812 (diff) | |
| parent | e4f81090c27d22b418d2cbe874fc28cbcf810167 (diff) | |
am 4e345ab7: (-s ours) am a2977c38: Merge changes Ie03796ae,Ide3e980a into gingerbread
* commit '4e345ab7df737592528e99db73612c6b37e34545':
[3171580] SurfaceFlinger Bypass mode. (DO NOT MERGE)
[3171580] Add transform field to native buffers. (DO NOT MERGE)
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions