tree 273b4b3aa02796bc8bdd73e40e26d81c25fa5e25
parent 38e326d8cd7073a11f803d59d976238fd77aeb38
parent cac75a8b7797086a34e2d50b69b36d0ecad37f9b
author Adam Cohen <adamcohen@google.com> 1422669698 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422669698 +0000

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

* commit 'cac75a8b7797086a34e2d50b69b36d0ecad37f9b':