Merge "New listener to recognize stylus button press gesture in GestureDetector"

author Mady Mellor <madym@google.com>

Thu, 16 Apr 2015 16:55:06 +0000 (16:55 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Thu, 16 Apr 2015 16:55:07 +0000 (16:55 +0000)
author Mady Mellor <madym@google.com>
Thu, 16 Apr 2015 16:55:06 +0000 (16:55 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 16 Apr 2015 16:55:07 +0000 (16:55 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
author	Mady Mellor <madym@google.com>
	Thu, 16 Apr 2015 16:55:06 +0000 (16:55 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 16 Apr 2015 16:55:07 +0000 (16:55 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history