diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-05-19 08:21:54 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-19 08:21:54 -0700 |
| commit | 0b6defefb961b2c61ac50f16185f35cef1de870e (patch) | |
| tree | 9e16f1e6768fa94be71bcad30b08e99e35daf217 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 984680baff0a7343ea8e5407112b9eb044814f11 (diff) | |
| parent | aa2fe148496858e17d0ffd2b8d5d29b89d400934 (diff) | |
am aa2fe148: merge from open-source master
Merge commit 'aa2fe148496858e17d0ffd2b8d5d29b89d400934' into kraken
* commit 'aa2fe148496858e17d0ffd2b8d5d29b89d400934':
Improved error handling when font loading fails.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions