tree e2d95cea923fc78a2ee49e4ebe261db0ff1c1c94
parent 543945669b60c9f1b5e1ad6ac14bf794bf796d5d
parent f647cde899c4462b465721cd705f234da7e82730
author Chet Haase <chet@google.com> 1422036711 +0000
committer android-build-merger <android-build-merger@google.com> 1422036711 +0000

am af8c621d: Merge "Allow infinite-repeat zero-duration animators to continue repeating" into lmp-mr1-dev automerge: 458cc6a
automerge: f647cde

* commit 'f647cde899c4462b465721cd705f234da7e82730':
  Allow infinite-repeat zero-duration animators to continue repeating