tree 10da860fcff71886af91d082e31f0e1917926848
parent e5bdad683ae1372831acaaa1fab949c98cbeddf0
parent cf29e8a8fa2c181af089b211707890cb471d62a7
author Adam Cohen <adamcohen@google.com> 1422666487 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422666487 +0000

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

* commit 'cf29e8a8fa2c181af089b211707890cb471d62a7':