tree 0b9d637f996b19173ead755b0a1d96dcabe0e1e4
parent c788b414c1d60058d577ebb37e303e4132339fa8
parent df871fe8d988b384bba8d60c65b50fda260591f3
author Michael Jurka <mikejurka@google.com> 1326830945 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1326830945 -0800

am df871fe8: Merge "Cleaning up animation code"

* commit 'df871fe8d988b384bba8d60c65b50fda260591f3':
  Cleaning up animation code