diff options
| author | Jim Miller <jaggies@google.com> | 2010-04-05 17:25:17 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-05 17:25:17 -0700 |
| commit | c13aae1e42d7092b27ae89ec638592c66b25215d (patch) | |
| tree | ba02998adcfbe8e2fb1483d418f63704657336f5 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 7ead4131d88c39da93da8b6e0605b0a972b748b0 (diff) | |
| parent | 5047c0841dab886e0808b5a5686dc82d57ae6256 (diff) | |
am bf81cb91: am a6cce790: Merge "Fix 2325549: Allow up to 4 lines of summary text in Settings" into froyo
Merge commit 'bf81cb91aa584d3b52d807aa4134a1a90569de31' into kraken
* commit 'bf81cb91aa584d3b52d807aa4134a1a90569de31':
Fix 2325549: Allow up to 4 lines of summary text in Settings
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions