diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2010-12-01 03:35:02 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-12-01 03:35:02 -0800 |
| commit | 4191ea8c1c2392b596934aaf4cbda8ba8c3ec14e (patch) | |
| tree | aad37749d50f5e3bdd41946934aec27284cc4b77 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 6ec8805d439cfac279019766d61fd8130abf45b9 (diff) | |
| parent | 915f0c59c7bd6a41f4bb18c204aae3f1917c9716 (diff) | |
am fb9612ba: (-s ours) am 04d2cc05: Merge "Do not merge: Doc change: API diff report for gingerbread." into gingerbread
* commit 'fb9612ba98f29b794244323cab6f56204d072eeb':
Do not merge: Doc change: API diff report for gingerbread.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions