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)