diff options
| author | Eric Fischer <enf@google.com> | 2010-09-27 21:03:02 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-27 21:03:02 -0700 |
| commit | fa8b818204208dd8776d8daeb61c1a9579f37e4c (patch) | |
| tree | 355bbde30004c085072c85fa7f9e54c1710673b1 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 126f463bd5a9497fa7d0cec626926bfe560ab4fa (diff) | |
| parent | 96d205574b0ff6c58af80e2e67d5478cd771255d (diff) | |
am 7063eb10: (-s ours) am dc36da51: Merge "Trim unwanted whitespace from translations. DO NOT MERGE" into gingerbread
Merge commit '7063eb104657d1fa3f5e030b4657a9541ec6b054'
* commit '7063eb104657d1fa3f5e030b4657a9541ec6b054':
Trim unwanted whitespace from translations. DO NOT MERGE
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions