diff options
author | Adam Cohen <adamcohen@google.com> | 2011-11-30 21:14:53 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-30 21:14:53 -0800 |
commit | 404e71a38d6b6d1efc078dfc430f324fab9ed5c4 (patch) | |
tree | c908dc021a1ae92fc6402bf7d21813c1938411cd /opengl/tests/gl_basic/gl_basic.cpp | |
parent | ef826dad7734dc435d2dcf7e76efa3b2674ecbef (diff) | |
parent | a5bc14b4f54f4a445ed15eb9db86278c15fc102d (diff) |
am 2a163f61: am 557a1772: Merge "Working around issue where setting min height on RelativeLayout causes items to collapse. (Bug 5640357)" into ics-mr1
* commit '2a163f6171c06d9bbee9ce49fad478336210d37d':
Working around issue where setting min height on RelativeLayout causes items to collapse. (Bug 5640357)
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions