diff options
| author | Gilles Debunne <debunne@google.com> | 2011-02-04 15:54:19 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-04 15:54:19 -0800 |
| commit | 7c1ca4958bd8ca926e3e05e36defd30cf5fac7dc (patch) | |
| tree | ea8394774dd2af9d10699c0198d5639d47f212a6 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 5e10f21c60f25d9125fbea556cfbdfedbb893d8c (diff) | |
| parent | 3716ff2ddd0bc346f2fcd09648e63ae8d684989e (diff) | |
am 1ba2a47b: (-s ours) am 893ac28f: Merge "Blinking runnable is created only if text is editable. DO NOT MERGE." into gingerbread
* commit '1ba2a47b82b950934ddf04570fb24124aec7f249':
Blinking runnable is created only if text is editable. DO NOT MERGE.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions