am 36ffd6d6: am ed836dec: am cac7b2b1: Merge "Update stylus button press recognition...

author Mady Mellor <madym@google.com>

Mon, 1 Jun 2015 19:04:15 +0000 (19:04 +0000)

committer Android Git Automerger <android-git-automerger@android.com>

Mon, 1 Jun 2015 19:04:15 +0000 (19:04 +0000)
author Mady Mellor <madym@google.com>
Mon, 1 Jun 2015 19:04:15 +0000 (19:04 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Mon, 1 Jun 2015 19:04:15 +0000 (19:04 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
author	Mady Mellor <madym@google.com>
	Mon, 1 Jun 2015 19:04:15 +0000 (19:04 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Mon, 1 Jun 2015 19:04:15 +0000 (19:04 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history