am da6f2b54: am 9c982340: Merge "Fix LinearLayout measureWithLargestChild for wrap_content views" into jb-dev
am da6f2b54: am 9c982340: Merge "Fix LinearLayout measureWithLargestChild for wrap_content views" into jb-dev

* commit 'da6f2b54caedee4c5e9af86d49e6c95aee054340':
  Fix LinearLayout measureWithLargestChild for wrap_content views

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