diff options
| author | Scott Main <smain@google.com> | 2012-01-31 08:58:51 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-01-31 08:58:51 -0800 |
| commit | 7a3c2dfc39a3e668ac103a54a13d1d8701bad60e (patch) | |
| tree | a7bc38328dfbcdfc5221a2334b28be7cfe70cebb /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 61cf2efec0da0485defa0b3113ab38e5a8646e72 (diff) | |
| parent | 7b8d173a28f26c8eefb004126f9ff38830532bbc (diff) | |
am 123ffc1f: am 34260ad7: Merge "docs: fix locale name; South Africa is local en_ZA external issue 23133" into ics-mr1
* commit '123ffc1fa40749dd2f2eef94fa1ab0306604b1ae':
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