am a28d5aff: Merge "Fix a bug synthesizing cancelation events for motions." into gingerbread

Merge commit 'a28d5aff5466a55149b9e6f9cd908fcc225c25ff' into gingerbread-plus-aosp

* commit 'a28d5aff5466a55149b9e6f9cd908fcc225c25ff':
  Fix a bug synthesizing cancelation events for motions.