diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-02-24 17:24:07 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-24 17:24:07 -0800 |
| commit | 5000d24f60ebeb9329cc9a99c9b08aaf1bf89531 (patch) | |
| tree | 2de34eaf949bd30904e7e7343a64fce86fec4561 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 6043f9643771264ff6832b7367f60c50f1658952 (diff) | |
| parent | a79113be346ea0d64974b3c6ac84dfe823b96c63 (diff) | |
am db1acf52: (-s ours) am 1175ef7e: Merge "LayoutLib: Adapt the HC layoutlib to GB. do not merge." into gingerbread
* commit 'db1acf52bb6e4b949bcef09f903d662aed9b8a3a':
LayoutLib: Adapt the HC layoutlib to GB. do not merge.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions