tree a2b2594d86b8900e1794d5c32532c482114aff98
parent 4b1fc0434bef116a794b47e141b13408d8da3ddb
parent f30b8e4bce542cd9a59120b7b150e5eb4563e3e8
author Justin Klaassen <justinklaassen@google.com> 1412981598 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412981598 +0000

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

* commit 'f30b8e4bce542cd9a59120b7b150e5eb4563e3e8':
  Set AlarmActivity's animator progress directly