OSDN Git Service

am 47a74e7e: Merge "Ensure maxHeight is at least 0 during measureChildHorizontal...
authorAlan Viverette <alanv@google.com>
Wed, 29 Jul 2015 20:13:07 +0000 (20:13 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 29 Jul 2015 20:13:07 +0000 (20:13 +0000)
commit0322ccf69a40786550ccb75f81881f2915906f17
tree7e470a94012e1d8cb33551400c7062407a9f799b
parent401de11f16274df1dd248f4697cd159ccfca37c9
parent47a74e7e2b45d9ec462f47f6741c381c478b4156
am 47a74e7e: Merge "Ensure maxHeight is at least 0 during measureChildHorizontal()" into mnc-dev

* commit '47a74e7e2b45d9ec462f47f6741c381c478b4156':
  Ensure maxHeight is at least 0 during measureChildHorizontal()