summaryrefslogtreecommitdiff
path: root/opengl/java/android/opengl/Texture.java
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2011-11-30 21:13:04 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-30 21:13:04 -0800
commit2a163f6171c06d9bbee9ce49fad478336210d37d (patch)
tree6c4207677ffef8d9a5ebc19878e813b0ca978562 /opengl/java/android/opengl/Texture.java
parentf5fd08d64959f23ba87f4da4771ca511b05a6be0 (diff)
parent557a1772f676480da75fff81ff38d6e896fce0a2 (diff)
am 557a1772: Merge "Working around issue where setting min height on RelativeLayout causes items to collapse. (Bug 5640357)" into ics-mr1
* commit '557a1772f676480da75fff81ff38d6e896fce0a2': 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