diff options
| author | Eric Fischer <enf@google.com> | 2011-06-02 03:21:06 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-02 03:21:06 -0700 |
| commit | 31684b24e010a6caf393803399c49eb25d2c0f45 (patch) | |
| tree | d22b6e74ceca0cc372ef3956198779d7b63c9b46 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | e5d1139a82602355522135fad0bc599e163b6d71 (diff) | |
| parent | 31d0f4b7d9ce92ed588b0ca1527b5d461d01a357 (diff) | |
am 0bb63c58: (-s ours) am 90856661: am 66fd9ab2: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
* commit '0bb63c58a464e7df60de103319204b7b590e5d75':
Import revised translations. DO NOT MERGE
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions