diff options
| author | Leon Scroggins <scroggo@google.com> | 2011-03-08 09:16:34 -0800 | 
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-08 09:16:34 -0800 | 
| commit | 131feb3085df821133de3b098c615c5f0d5581c0 (patch) | |
| tree | 4438183a1b7d812870183cee0673d1a76d24d729 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 4dfc3d1454f8ef5152267415dd637b92889b2999 (diff) | |
| parent | 5c1ff3d45e15bf358ab252e30db312810f74232c (diff) | |
am f279269a: am 055a8585: Merge "Do not attempt to start action mode if there is no parent." into honeycomb-mr1
* commit 'f279269a4c2e86092b99b67766b9fc1077f2526d':
  Do not attempt to start action mode if there is no parent.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions
