diff options
| author | Cary Clark <cary@android.com> | 2010-09-21 11:54:51 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-21 11:54:51 -0700 |
| commit | c407b117e827363eba94edcfc9ec8204eea473f4 (patch) | |
| tree | 25d414048817d4a815150609c0ee56b358a0b4bb /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | d19d530ebf018115ad972c0daf3095edb0b6c7c1 (diff) | |
| parent | fe6d79386a851e49be538181c540b58dd8e18bea (diff) | |
am 100cc263: (-s ours) am b5631f59: Merge "Do not merge : cancel text select mode when pressing back, etc." into gingerbread
Merge commit '100cc263b465242c01dc9eb280d77ffaadbddd39'
* commit '100cc263b465242c01dc9eb280d77ffaadbddd39':
Do not merge : cancel text select mode when pressing back, etc.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions