diff options
| author | Eric Fischer <enf@google.com> | 2011-04-04 16:46:38 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-04-04 16:46:38 -0700 |
| commit | 82881420f024430b28d810a2ccf276d3f419d923 (patch) | |
| tree | 9e6efa730f6809bd12f2bed0f686de6757ba5ffa /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | d66f55e1f706dfae949224afdfdb618278648c39 (diff) | |
| parent | ec180cff052bce692eb9f9b3683bd65dfe5c08d6 (diff) | |
am 2e715df8: (-s ours) am d20023ae: (-s ours) am 8b312c6c: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '2e715df8d4a568d3a6d7e2ee569ab1331dcafaa7':
Import revised translations. DO NOT MERGE
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions