Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev

author Michael Wright <michaelwr@google.com>

Thu, 19 May 2016 15:12:29 +0000 (15:12 +0000)

committer android-build-merger <android-build-merger@google.com>

Thu, 19 May 2016 15:12:29 +0000 (15:12 +0000)
author Michael Wright <michaelwr@google.com>
Thu, 19 May 2016 15:12:29 +0000 (15:12 +0000)
committer android-build-merger <android-build-merger@google.com>
Thu, 19 May 2016 15:12:29 +0000 (15:12 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc api/test-current.txt
Simple merge
diff --cc core/res/res/values/attrs.xml
Simple merge
author	Michael Wright <michaelwr@google.com>
	Thu, 19 May 2016 15:12:29 +0000 (15:12 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 19 May 2016 15:12:29 +0000 (15:12 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/test-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/res/values/attrs.xml	patch \|	diff1 \|	diff2 \|	blob \| history