diff options
| author | Eric Fischer <enf@google.com> | 2011-01-31 18:38:24 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-31 18:38:24 -0800 |
| commit | 26b3d8dd97dd1b5b0fa9741906a29954307df235 (patch) | |
| tree | ae32e366e7eea386e2213a28ed10d5e6bad0b31c /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 66a11842204688de2a57c35e6eba0f9063d17b1e (diff) | |
| parent | 3f6ea5432bbc395913226f1d7999a9b0a8a651bc (diff) | |
am 05437aad: (-s ours) am 122106cb: Merge "Import revised translations. DO NOT MERGE. Bug 3394542" into honeycomb
* commit '05437aad8e250f508e73d4ddcce9ef99393d9414':
Import revised translations. DO NOT MERGE. Bug 3394542
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions