tree 218a14dfb66472068b7a03e2ad2b9440311065b3
parent 7fedf5d4690fdb84283ac91703ee7aee34ab9049
parent 4c06870db615acbf50008e0bc964e15a1c36aa22
author Alan Viverette <alanv@google.com> 1438201593 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438201593 +0000

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

* commit '4c06870db615acbf50008e0bc964e15a1c36aa22':
  Ensure maxHeight is at least 0 during measureChildHorizontal()