diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-06-28 19:15:32 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-28 19:15:32 -0700 |
| commit | 30f659aae9b8c7e56da0128f4627dceb42a89f64 (patch) | |
| tree | 6fb205a733931a18b7a55cc3ef341c19b33e7496 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | a571674a93c62f432c9b266d814650b0264fc444 (diff) | |
| parent | 0889d3a6515062fcfc258e2ac2bda67bfb5cc120 (diff) | |
am e1918353: am 842725fc: (-s ours) am 4d825e1f: Merge "Bring in more layout lib changes from hc-mr1." into gingerbread
* commit 'e1918353e795d4f4fb67760ad593458517976072':
Bring in more layout lib changes from hc-mr1.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions