From: Michael Wright <michaelwr@google.com>
Date: Fri, 10 Jul 2015 00:26:36 +0000 (+0000)
Subject: am f37143d8: Merge "Cancel touches as well as pointer gestures." into mnc-dev
X-Git-Tag: android-x86-7.1-r1~544^2~220
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9b70ab7a3cb260205e81e40ba181a86710d2eb95;p=android-x86%2Fframeworks-native.git

am f37143d8: Merge "Cancel touches as well as pointer gestures." into mnc-dev

* 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.
---

9b70ab7a3cb260205e81e40ba181a86710d2eb95