diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-21 16:43:24 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-07-21 16:43:24 -0700 |
| commit | 97148f3bba2fbb4a46def13a24d6a2718eefc197 (patch) | |
| tree | fa941fbbc5ba2acffdbf4b3c45ccaa468b7e770d /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 80a5309a33faad76299acce6e84f017ef743ee5e (diff) | |
| parent | 5ca7c239609113a58cb9a0ab1c8e880aa416fd54 (diff) | |
am 7e71fb28: Merge change 8111 into donut
Merge commit '7e71fb284d5997bff7e359edc8e1b19cbfb1c9ca'
* commit '7e71fb284d5997bff7e359edc8e1b19cbfb1c9ca':
Don't start search from a dialog if there is no activity associated with
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions