Merge "Track external/icu API changes for factory registration" into nyc-dev am:...

author Neil Fuller <nfuller@google.com>

Thu, 5 May 2016 10:03:19 +0000 (10:03 +0000)

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

Thu, 5 May 2016 10:03:19 +0000 (10:03 +0000)
author Neil Fuller <nfuller@google.com>
Thu, 5 May 2016 10:03:19 +0000 (10:03 +0000)
committer android-build-merger <android-build-merger@google.com>
Thu, 5 May 2016 10:03:19 +0000 (10:03 +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	Neil Fuller <nfuller@google.com>
	Thu, 5 May 2016 10:03:19 +0000 (10:03 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 5 May 2016 10:03:19 +0000 (10:03 +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