diff options
| author | Eric Fischer <enf@google.com> | 2011-02-28 22:23:03 -0800 | 
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-28 22:23:03 -0800 | 
| commit | 3222ef69a91a8ae01c9a195a749a600cbf5ce8bb (patch) | |
| tree | 539d89ca8a1c9b515416402633c4f1e04738c7b9 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | ba1fced2572eab866ee802d720a1aa0ae0a773af (diff) | |
| parent | 68e75a92e413e0953f5e9cdf7976ae0237b0ea1c (diff) | |
am ae7fb488: (-s ours) am 04a536af: Merge "Import revised translations.  DO NOT MERGE" into honeycomb
* commit 'ae7fb4887394615b58c4e97fc5b1ad2e04441903':
  Import revised translations.  DO NOT MERGE
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions
