| commit | 4c06870db615acbf50008e0bc964e15a1c36aa22 | [log] [tgz] |
|---|---|---|
| author | Alan Viverette <alanv@google.com> | Wed Jul 29 20:10:21 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 29 20:10:21 2015 +0000 |
| tree | 05b14c3a4c193c2383487bb3649ce055144ec18d | |
| parent | 1c8107dd89c8424c8fad9e341dc43be04e1a62ae [diff] | |
| parent | 47a74e7e2b45d9ec462f47f6741c381c478b4156 [diff] |
am 47a74e7e: Merge "Ensure maxHeight is at least 0 during measureChildHorizontal()" into mnc-dev * commit '47a74e7e2b45d9ec462f47f6741c381c478b4156': Ensure maxHeight is at least 0 during measureChildHorizontal()