OSDN Git Service

am 21d2fe72: (-s ours) am dd71ee89: am 0a77df93: am ce92ce9b: Merge "DO NOT MERGE...
authorMichael Wright <michaelwr@google.com>
Thu, 24 Sep 2015 22:56:42 +0000 (22:56 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 24 Sep 2015 22:56:42 +0000 (22:56 +0000)
* commit '21d2fe7254188908bd1b16ec1ecf91d3d5e5440e':
  DO NOT MERGE Cancel touches as well as pointer gestures.


Trivial merge