diff options
| author | Adam Powell <adamp@google.com> | 2010-10-05 15:16:48 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-05 15:16:48 -0700 |
| commit | 11d97cc01297435f915b1c560e2ebc2b620310f0 (patch) | |
| tree | c7f57a471ef7a293ba101955c412b9d2376d3908 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 6b391886cff177ac695d1bbb2f9e3d313fe3e267 (diff) | |
| parent | e5ada36d2b105b9bc5c23b3f944bad8bfb59ea68 (diff) | |
am b8d3bc5c: (-s ours) am 103f59ba: Merge "Fix bug 3052686 - ScrollView padding treated incorrectly" into gingerbread
Merge commit 'b8d3bc5c3c65bbf71a6aa3f8345db024a4ba0669'
* commit 'b8d3bc5c3c65bbf71a6aa3f8345db024a4ba0669':
Fix bug 3052686 - ScrollView padding treated incorrectly
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions