diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2009-12-21 15:52:57 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-21 15:52:57 -0800 |
| commit | 6fe591ef942bafc170d4a67359cf6f800987bddc (patch) | |
| tree | 7b16fb6f6bf50feb3c130e615fcac06986d1767f /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | f901297671dca93539c11b3cf9326f46543c0f84 (diff) | |
| parent | 78ffea7ef4f6fdb48ee9c6b52291e0cd6d1c1ee4 (diff) | |
am c4978805: merge from open-source master
Merge commit 'c4978805dc8837570701629a9b8098e80804ad34'
* commit 'c4978805dc8837570701629a9b8098e80804ad34':
ImageButton example doesn't work. Default state should be at the last.
Time.parse3339 range checking and proper 'sec-frac' skip
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions