Merge \\"Track libcore change fec24735b29faf2a81dbbc35a3a5f9630a597259\\" into stage...

author Yi Kong <yikong@google.com>

Fri, 24 Jun 2016 17:01:06 +0000 (17:01 +0000)

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

Fri, 24 Jun 2016 17:01:06 +0000 (17:01 +0000)
author Yi Kong <yikong@google.com>
Fri, 24 Jun 2016 17:01:06 +0000 (17:01 +0000)
committer android-build-merger <android-build-merger@google.com>
Fri, 24 Jun 2016 17:01:06 +0000 (17:01 +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	Yi Kong <yikong@google.com>
	Fri, 24 Jun 2016 17:01:06 +0000 (17:01 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 24 Jun 2016 17:01:06 +0000 (17:01 +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