am 6c71d476: (-s ours) am 8368ef0b: Manual merge of 40080 DO NOT MERGE...
am 6c71d476: (-s ours) am 8368ef0b: Manual merge of 40080 DO NOT MERGE Properly notifies listener when an animation is cancelled. Bug: #2428005.
Merge commit '6c71d476'
* commit '6c71d476':
Manual merge of 40080 DO NOT MERGE