tree fe21627dae085349bd1f0724ac6a7d6a6b10eac5
parent 5fb0b4555bbac910c9fbb99a97bdf68255a3e1c5
parent 9f16fd5b12b73bfa4c781811d1963328d6594add
author Daniel Sandler <dsandler@android.com> 1362517712 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1362517712 +0000

am 9f16fd5b: am 56bea4d4: Merge "Defend against NaNs in panel animation code." into jb-mr2-dev

* commit '9f16fd5b12b73bfa4c781811d1963328d6594add':
  Defend against NaNs in panel animation code.