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 | bd573a38133f7f2de1e34d57f726a4538e8cfcc5 (patch) | |
| tree | dc0d55c6e489b4ff2c2e3372ff6ab4b1d6aa9d71 /opengl/java/android/opengl/Texture.java | |
| parent | 4d774e0ac274e2a1c2a65a9dedfb336c95879f05 (diff) | |
| parent | 2a163f6171c06d9bbee9ce49fad478336210d37d (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/java/android/opengl/Texture.java')
0 files changed, 0 insertions, 0 deletions