diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2011-08-04 18:46:02 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2011-08-04 18:46:02 -0700 |
| commit | 167c90ba776cc707ce323fd24e0719aa578193c5 (patch) | |
| tree | dda23262c8fedd883abb187f369fea84b746c67d /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | cdb71f02bde275f7cdfced6e8e6ed099f8d7f151 (diff) | |
| parent | 3b84a48a676d81a4696141b4480b40b59be00b14 (diff) | |
| parent | 23ca1ed524956126ce85c1e6f661b7ced2c91372 (diff) | |
Reconcile with gingerbread-release gingerbread-mr4-release
Change-Id: I4ef90a9d38940c8484c030056157a99a103f6aa9