tree 2f47be44eba4afd2229f95e770cc5cf58b0f0061
parent 4854d113cee165cdc63a4f0b0e1d7b5f91cd55ce
parent 5c380efa2c0bf3617aedbb9270fa02cce59c7935
author Alan Viverette <alanv@google.com> 1438200779 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438200779 +0000

am 5c380efa: Merge "Always distribute excess space in LinearLayout measurement" into mnc-dev

* commit '5c380efa2c0bf3617aedbb9270fa02cce59c7935':
  Always distribute excess space in LinearLayout measurement