OSDN Git Service

Merge commit '71997c1a' into manualmerge
authorMichael Wright <michaelwr@google.com>
Tue, 23 Jun 2015 18:04:31 +0000 (19:04 +0100)
committerMichael Wright <michaelwr@google.com>
Tue, 23 Jun 2015 18:04:31 +0000 (19:04 +0100)
commit7d3ad695304a1f24026227e630add6edd76fd0d6
treef7a3a8769cc9321a08b4e1a1e4e1fed2732f4bd6
parentcc62b6c65eb51b62774882c53c53e20c336bc998
parent71997c1a921b8d55cff4581fe29743553654912b
Merge commit '71997c1a' into manualmerge

Change-Id: Ia68fbd20ce66571dfd33764e52c3a00e2285e648
include/android/input.h
services/inputflinger/InputReader.cpp