tree 544cb16c79805c24cf2335f00d8add1187d65f49
parent 3b4c2c982ef4ac681929678288ce042e4c0a5be6
parent a6336747a42fa5b64f82b7fe57ddf614d1fda9b2
author Nick Kralevich <nnk@google.com> 1404579131 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404579131 +0000

am a6336747: Merge "Fix a copy/paste typo in ViewPropertyAnimator"

* commit 'a6336747a42fa5b64f82b7fe57ddf614d1fda9b2':
  Fix a copy/paste typo in ViewPropertyAnimator