tree 985293680b0f1bf915b30dc943f235fcbfa43d5e
parent 0abba36638d5fd379c98c1387f7deabbfec71fe5
parent 7d2e075564d34c8dfac8536316822a65b0a7ceb5
author Justin Klaassen <justinklaassen@google.com> 1412970452 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412970452 +0000

am 7d2e0755: Merge "Set AlarmActivity\'s animator progress directly" into lmp-dev

* commit '7d2e075564d34c8dfac8536316822a65b0a7ceb5':
  Set AlarmActivity's animator progress directly