am 22f0d8c9: Merge "Always honor fixed size children"
am 22f0d8c9: Merge "Always honor fixed size children"

# Via Android (Google) Code Review (1) and Romain Guy (1)
* commit '22f0d8c949b41c1494a4c6ca530853163fa86706':
  Always honor fixed size children

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