tree d9fa57f606aefa8c40f11f168ae6708b422f692f
parent ced8a0ce0ad583e886940889cb9a876fd4fbdcae
parent cf29e8a8fa2c181af089b211707890cb471d62a7
author Adam Cohen <adamcohen@google.com> 1409267970 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409267970 +0000

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

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