diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-04-15 14:41:13 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-04-15 14:41:13 -0700 |
| commit | 4369bc5835ef1527969c47fd4dce014ad16dc9e5 (patch) | |
| tree | 01c011c8b7ad5086ce0256debed2748ce3ccc6be /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | f70f7d043ff61209f188636d900c92e07eb84eea (diff) | |
| parent | 0a7b355da93d5ac8597b3036e1a2ca921ba3c24d (diff) | |
Merge "Introduce new API version to avoid breakage with the Froyo APIs; introduce padding in the resources to avoid cross-branch merge pain." into kraken
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions