diff options
| author | Cary Clark <cary@android.com> | 2010-09-21 11:51:23 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-21 11:51:23 -0700 |
| commit | fe6d79386a851e49be538181c540b58dd8e18bea (patch) | |
| tree | 7d0f7ca035d28794849b31df6f339e41ce6bee2c /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 5d45c887a0c1db9f9b7c5d111376b823e4e5b00b (diff) | |
| parent | 205097dd3ced41cc707119ce66a416e6ed892d14 (diff) | |
am b5631f59: Merge "Do not merge : cancel text select mode when pressing back, etc." into gingerbread
Merge commit 'b5631f59d3b0411ed493dc382bb96ab15ca3304d' into gingerbread-plus-aosp
* commit 'b5631f59d3b0411ed493dc382bb96ab15ca3304d':
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