commit 7d3ad695304a1f24026227e630add6edd76fd0d6
author Michael Wright <michaelwr@google.com> Tue Jun 23 19:04:31 2015 +0100
committer Michael Wright <michaelwr@google.com> Tue Jun 23 19:04:31 2015 +0100
tree f7a3a8769cc9321a08b4e1a1e4e1fed2732f4bd6
parent cc62b6c65eb51b62774882c53c53e20c336bc998
parent 71997c1a921b8d55cff4581fe29743553654912b

Merge commit '71997c1a' into manualmerge

Change-Id: Ia68fbd20ce66571dfd33764e52c3a00e2285e648

include/android/input.h

diff --git a/include/android/input.h b/include/android/input.h
index 7b76539..5ab4e29 100644
--- a/include/android/input.h
+++ b/include/android/input.h
@@ -807,6 +807,8 @@
     AINPUT_SOURCE_MOUSE = 0x00002000 | AINPUT_SOURCE_CLASS_POINTER,
     /** stylus */
     AINPUT_SOURCE_STYLUS = 0x00004000 | AINPUT_SOURCE_CLASS_POINTER,
+    /** bluetooth stylus */
+    AINPUT_SOURCE_BLUETOOTH_STYLUS = 0x00008000 | AINPUT_SOURCE_STYLUS,
     /** trackball */
     AINPUT_SOURCE_TRACKBALL = 0x00010000 | AINPUT_SOURCE_CLASS_NAVIGATION,
     /** touchpad */