tree 60a86919e626e09690310f1a42282c82c53f52ac
parent e80305872e70c25c8576cfefba624cb3245939bd
parent c3003b601ddc3aef4ee6d3e6464772b396679285
author Adam Cohen <adamcohen@google.com> 1322716384 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1322716384 -0800

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)