commit | 7bfe7b5b541e3b4585c3ef7eb6d4fb3bd9218df0 | [log] [tgz] |
---|---|---|
author | Alan Viverette <alanv@google.com> | Fri Jul 31 21:39:03 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 31 21:39:03 2015 +0000 |
tree | 6a8ef21bddf284c9e14285b20c77f5d60aa946d5 | |
parent | 0568a230b34f879215e65fbaa79dfa377085bb41 [diff] | |
parent | 5cca30a4ee28a5e70531508d9ad607107adfaa86 [diff] |
am 5cca30a4: Merge "Revert two changes to LinearLayout measurement" into mnc-dev * commit '5cca30a4ee28a5e70531508d9ad607107adfaa86': Revert two changes to LinearLayout measurement