commit | 386dbb894577783235788786cf296f14e78f69ec | [log] [tgz] |
---|---|---|
author | Alan Viverette <alanv@google.com> | Thu Jun 25 20:07:43 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 25 20:07:43 2015 +0000 |
tree | a4ec57c0875bbdc3a498669409af1222566cc744 | |
parent | d408d293a516a3022c0f80d54a93a2f83288af46 [diff] | |
parent | fdf102e62ddf04ed1a3157b00d4da5b56d298df3 [diff] |
am fdf102e6: Merge "Constrain child width and height to >= 0 in FrameLayout.onMeasure()" into mnc-dev * commit 'fdf102e62ddf04ed1a3157b00d4da5b56d298df3': Constrain child width and height to >= 0 in FrameLayout.onMeasure()