diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-05-13 16:29:40 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-13 16:29:40 -0700 |
| commit | 7f1489bc4b9a8b2382491e2c98c76fabb6808966 (patch) | |
| tree | 384bd709bfdad1b99e928efef531b47d16a3d8f3 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | ac26a1fcc2341e378911412a0e8d27dc7ff42b31 (diff) | |
| parent | e50994f021552a2f56e2758e3de685f79be5ccfd (diff) | |
am 7d87c37b: am 6121f06e: Merge "Fix a bug where an action bar could be created when it should not be." into honeycomb-mr2
* commit '7d87c37b031616259d1db6a78ecb1ff20ee5ff5c':
Fix a bug where an action bar could be created when it should not be.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions