OSDN Git Service

am f37143d8: Merge "Cancel touches as well as pointer gestures." into mnc-dev
authorMichael Wright <michaelwr@google.com>
Fri, 10 Jul 2015 00:26:36 +0000 (00:26 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 10 Jul 2015 00:26:36 +0000 (00:26 +0000)
* commit 'f37143d8a55afc6481d31de1c6f8e8db9578ef1d':
  Cancel touches as well as pointer gestures.
  Introduce stem keycodes for Wear
  Mock out more inputflinger host functions
  Remove unused ParcelFileDescriptor methods in parcel.
  Basic implementation of input device properties.


Trivial merge