Merge "Fix a copy/paste typo in ViewPropertyAnimator"

author Nick Kralevich <nnk@google.com>

Sat, 5 Jul 2014 16:47:22 +0000 (16:47 +0000)

committer Gerrit Code Review <noreply-gerritcodereview@google.com>

Wed, 2 Jul 2014 20:52:43 +0000 (20:52 +0000)
author Nick Kralevich <nnk@google.com>
Sat, 5 Jul 2014 16:47:22 +0000 (16:47 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 2 Jul 2014 20:52:43 +0000 (20:52 +0000)
diff --cc core/java/android/view/ViewPropertyAnimator.java
Simple merge
author	Nick Kralevich <nnk@google.com>
	Sat, 5 Jul 2014 16:47:22 +0000 (16:47 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Wed, 2 Jul 2014 20:52:43 +0000 (20:52 +0000)