OSDN Git Service

am 0322ccf6: (-s ours) am 47a74e7e: Merge "Ensure maxHeight is at least 0 during...
authorAlan Viverette <alanv@google.com>
Thu, 27 Aug 2015 09:27:03 +0000 (09:27 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 09:27:03 +0000 (09:27 +0000)
commit11b2e9731321b403e348181d832696772efcd9c9
tree715d547d2502de8d04de0ec12233b3183ce62c99
parentced27b4451b1e4e7497b7c6430a216e954e1fca9
parent0322ccf69a40786550ccb75f81881f2915906f17
am 0322ccf6: (-s ours) am 47a74e7e: Merge "Ensure maxHeight is at least 0 during measureChildHorizontal()" into mnc-dev

* commit '0322ccf69a40786550ccb75f81881f2915906f17':