diff options
| author | Jim Miller <jaggies@google.com> | 2010-04-05 17:21:20 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-05 17:21:20 -0700 |
| commit | 5047c0841dab886e0808b5a5686dc82d57ae6256 (patch) | |
| tree | cdbf9768a271b0e0c930e042bbf7359082ffb896 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 73b2cd72c43f87d27fe53fbab6658c551d35c340 (diff) | |
| parent | 3abdeafc34ab619d0a664fba029085dd703dab6e (diff) | |
am a6cce790: Merge "Fix 2325549: Allow up to 4 lines of summary text in Settings" into froyo
Merge commit 'a6cce790b24debae49f1df9f039e83e3e29e5cd1' into froyo-plus-aosp
* commit 'a6cce790b24debae49f1df9f039e83e3e29e5cd1':
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