diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-05-14 13:54:56 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-14 13:54:56 -0700 |
| commit | 50c434ca216b2a94f1c30dbfc1635d572a2bf45f (patch) | |
| tree | a86fbca9a6c2aebc8cc8c558d932c3e4ed9d2744 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 078418eccda820d49c626b39ec95da60c20c3274 (diff) | |
| parent | 4dd72e10ee8728834c2eb90aa6f800fa80206f61 (diff) | |
am 55b7d124: merge from open-source master
Merge commit '55b7d1243f15395a102971e8fdc57444638729ac' into kraken
* commit '55b7d1243f15395a102971e8fdc57444638729ac':
SetLocaleByCarrier, only if its not an unknown carrier.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions