tree 68330b5adbe51abc5be73a2ddf356b178cf19087
parent fd41feee6b909670010da79a0800c1aa2ce44255
parent 3e2ec1cc9c13a9d0c701727265870c182c1c18ec
author Alan Viverette <alanv@google.com> 1422587706 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1422587707 +0000

Merge "Avoid bug in LinearLayout measurement" into lmp-mr1-dev