| commit | e013384386e1973f63d56665718eb4927fd795ed | [log] [tgz] |
|---|---|---|
| author | Alan Viverette <alanv@google.com> | Wed Jul 29 22:05:04 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 29 22:05:04 2015 +0000 |
| tree | 1ad432a7a3c0052bc6f42c5bca08861070e6b888 | |
| parent | 2c48d46d52396a073885e12272071aadfc98a734 [diff] | |
| parent | 1a9097b5695759aa1e9e8fea563a7a569c0b345f [diff] |
am 1a9097b5: am d02e90f2: am 5466d754: am 4c06870d: am 47a74e7e: Merge "Ensure maxHeight is at least 0 during measureChildHorizontal()" into mnc-dev * commit '1a9097b5695759aa1e9e8fea563a7a569c0b345f': Ensure maxHeight is at least 0 during measureChildHorizontal()