Merge "Track libcore commit 2fd032687ba3d4d7f6af560482c5aba525584621" am: c895fcef8f...

author Przemyslaw Szczepaniak <pszczepaniak@google.com>

Mon, 10 Jul 2017 14:02:33 +0000 (14:02 +0000)

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

Mon, 10 Jul 2017 14:02:33 +0000 (14:02 +0000)
author Przemyslaw Szczepaniak <pszczepaniak@google.com>
Mon, 10 Jul 2017 14:02:33 +0000 (14:02 +0000)
committer android-build-merger <android-build-merger@google.com>
Mon, 10 Jul 2017 14:02:33 +0000 (14:02 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc api/test-current.txt
Simple merge
author	Przemyslaw Szczepaniak <pszczepaniak@google.com>
	Mon, 10 Jul 2017 14:02:33 +0000 (14:02 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Mon, 10 Jul 2017 14:02:33 +0000 (14:02 +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