diff options
| author | Mindy Pereira <mindyp@google.com> | 2010-10-11 09:44:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-11 09:44:16 -0700 |
| commit | 7eb309d4f136e83d29da701a8a47e4ba4047d8dd (patch) | |
| tree | dea944ef79b5fba8dac214b522bd2f9a5623b054 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 236906b31d7723df7fe288877b99ee858eb3db58 (diff) | |
| parent | cc7fa4373618649183347bfe26aae5eec8d72c25 (diff) | |
am 37c8ad77: (-s ours) am 13a81aad: Merge "DO NOT MERGE Limit the height of the pull glow." into gingerbread
Merge commit '37c8ad779fb171470af2757b5750c1b5f2d1f368'
* commit '37c8ad779fb171470af2757b5750c1b5f2d1f368':
DO NOT MERGE Limit the height of the pull glow.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions