am 8368ef0b: Manual merge of 40080 DO NOT MERGE Properly notifies listener...
am 8368ef0b: Manual merge of 40080 DO NOT MERGE Properly notifies listener when an animation is cancelled. Bug: #2428005.
Merge commit '8368ef0b' into eclair-plus-aosp
* commit '8368ef0b':
Manual merge of 40080 DO NOT MERGE