Merge "Track libcore change 69860bf2b28f0e14741a8895abdb77b45d1ed55d" am: c0d71fa38a...

author Przemyslaw Szczepaniak <pszczepaniak@google.com>

Thu, 12 Jan 2017 11:44:11 +0000 (11:44 +0000)

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

Thu, 12 Jan 2017 11:44:11 +0000 (11:44 +0000)
author Przemyslaw Szczepaniak <pszczepaniak@google.com>
Thu, 12 Jan 2017 11:44:11 +0000 (11:44 +0000)
committer android-build-merger <android-build-merger@google.com>
Thu, 12 Jan 2017 11:44:11 +0000 (11:44 +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>
	Thu, 12 Jan 2017 11:44:11 +0000 (11:44 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 12 Jan 2017 11:44:11 +0000 (11:44 +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