tree 60dd97506f2107d5e91d0fa6d9c1310c8c500ddc
parent f4365b5c64a1850b6d16fac3daa6021db2e567f0
parent 67ef1c406cb8a288c5bcdb825a26e6020e0a6cac
author Adam Cohen <adamcohen@google.com> 1409267142 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409267142 +0000

am 67ef1c40: Merge "Fix regression which was causing requestLayout in layout pass" into ub-now-porkchop

* commit '67ef1c406cb8a288c5bcdb825a26e6020e0a6cac':
  Fix regression which was causing requestLayout in layout pass