| commit | d02e90f2c3917a983ed7f543efa30c05a34ee3ea | [log] [tgz] |
|---|---|---|
| author | Alan Viverette <alanv@google.com> | Wed Jul 29 20:41:43 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 29 20:41:43 2015 +0000 |
| tree | 41c2f8a64cb0465f1dbc47a73f95cfdf1a358619 | |
| parent | 91f2364738666674ad9dda7bc633d22ad5fb8680 [diff] | |
| parent | 5466d7548e32afecfda10aaeee05b89cdc3950e2 [diff] |
am 5466d754: am 4c06870d: am 47a74e7e: Merge "Ensure maxHeight is at least 0 during measureChildHorizontal()" into mnc-dev * commit '5466d7548e32afecfda10aaeee05b89cdc3950e2': Ensure maxHeight is at least 0 during measureChildHorizontal()