am 4c06870d: am 47a74e7e: Merge "Ensure maxHeight is at least 0 during...
am 4c06870d: am 47a74e7e: Merge "Ensure maxHeight is at least 0 during measureChildHorizontal()" into mnc-dev
* commit '4c06870d':
Ensure maxHeight is at least 0 during measureChildHorizontal()