tree 8f3d354c4235d39c4dfc9a1c2e5493d0ce51757e
parent 3a3fea4fed9a47cede8e789c474c4a4e4e6863ef
parent 8a0c8e78a7d938288e065b21e78b2de6097b1599
author Alan Viverette <alanv@google.com> 1444236191 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444236191 +0000

am 8a0c8e78: am 6a06f12c: Merge "Frameworks/base: Fix AdapterViewAnimator.createOrReuseLayoutParams"

* commit '8a0c8e78a7d938288e065b21e78b2de6097b1599':
  Frameworks/base: Fix AdapterViewAnimator.createOrReuseLayoutParams