tree c028bfe537607823c37e2ffc8c713c73059d3130
parent 884bd266c3e46d00207d10a36ba1cfe8e6297638
parent e0ff1ed6f4541a0ade80036058a0c91925708b80
author Adam Cohen <adamcohen@google.com> 1422685319 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422685319 +0000

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

* commit 'e0ff1ed6f4541a0ade80036058a0c91925708b80':