tree 6a8ef21bddf284c9e14285b20c77f5d60aa946d5
parent 0568a230b34f879215e65fbaa79dfa377085bb41
parent 5cca30a4ee28a5e70531508d9ad607107adfaa86
author Alan Viverette <alanv@google.com> 1438378743 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438378743 +0000

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

* commit '5cca30a4ee28a5e70531508d9ad607107adfaa86':
  Revert two changes to LinearLayout measurement