tree b7838f3e4b0927172bab51c6ccd93c2e51310eac
parent 41343c0f287863488a10a429d88ec094e9183938
parent 4cf97c915a3a1bb88fec3a99beee5675ae35acfe
author Alan Viverette <alanv@google.com> 1438447994 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438447994 +0000

am 4cf97c91: am 7bfe7b5b: am 5cca30a4: Merge "Revert two changes to LinearLayout measurement" into mnc-dev

* commit '4cf97c915a3a1bb88fec3a99beee5675ae35acfe':
  Revert two changes to LinearLayout measurement