diff options
| author | Scott Main <smain@google.com> | 2012-01-31 08:41:03 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-01-31 08:41:03 -0800 |
| commit | 7b8d173a28f26c8eefb004126f9ff38830532bbc (patch) | |
| tree | 62ae95e5606b65456e4877a437dfcb3020b7cee1 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 78dbcd5f1a6dcd95749fa88a53a8ca181e28d039 (diff) | |
| parent | addfd725e7dc3d29d4abfa1f73a5e5787a12d3ce (diff) | |
am 34260ad7: Merge "docs: fix locale name; South Africa is local en_ZA external issue 23133" into ics-mr1
* commit '34260ad79ede2ed35cc9859095b778f194b9650b':
docs: fix locale name; South Africa is local en_ZA external issue 23133
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions