am 557a1772: Merge "Working around issue where setting min height on RelativeLayout causes items to collapse. (Bug 5640357)" into ics-mr1
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)

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base