am 896b15ab: Merge change 27016 into eclair

Merge commit '896b15abea4e1c0ee98330964474672a7316ee50' into eclair-plus-aosp

* commit '896b15abea4e1c0ee98330964474672a7316ee50':
  A variety of work on animations.