| commit | 47a74e7e2b45d9ec462f47f6741c381c478b4156 | [log] [tgz] |
|---|---|---|
| author | Alan Viverette <alanv@google.com> | Wed Jul 29 20:02:41 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jul 29 20:02:41 2015 +0000 |
| tree | 312663b08fedec1464fe3ccb6cf237952b48c330 | |
| parent | 5c380efa2c0bf3617aedbb9270fa02cce59c7935 [diff] | |
| parent | 7a40d21d89682edef07b21110b779e0f1d9cafea [diff] |
Merge "Ensure maxHeight is at least 0 during measureChildHorizontal()" into mnc-dev