tree 61ffa63065139a98637ef22733140a0d29643bb9
parent 439e2db3f38f0d304757651b2d9291ba1c93f2d2
parent 5c380efa2c0bf3617aedbb9270fa02cce59c7935
author Alan Viverette <alanv@google.com> 1438200616 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438200616 +0000

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

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