diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-04-23 15:25:09 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-23 15:25:09 -0700 |
| commit | 58ff1ee5b5786b05fed3c307c381233dcc0a1b2b (patch) | |
| tree | 0647a68e25a4a6329cc0572a75dee37b8fd3dc19 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 3fad8a6b3dd8f6f7096e00d965e7ac2742346145 (diff) | |
| parent | b1e94813d1ccb316d08a4c407972eaa8d78009b0 (diff) | |
am cdf96f75: am 8b0047f8: Merge "Fix typo when parsing external platform version from Settings." into froyo
Merge commit 'cdf96f75da540d880ae6070d861aeb6adabbe9a3' into kraken
* commit 'cdf96f75da540d880ae6070d861aeb6adabbe9a3':
Fix typo when parsing external platform version from Settings.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions