Commits
Alan Viverette authored and Android Git Automerger committed a4a3c81e6baM
am 51a8fe95: (-s ours) am 5cca30a4: Merge "Revert two changes to LinearLayout measurement" into mnc-dev * commit '51a8fe950efb67e23b7bb64719322c0a7b415367':
Showing diff to5043aedb45a