Merge \\"Hide APIs that shouldn\\'t have been public\\" into nyc-mr1-dev am: 8317f93012

author Dave Langemak <dlangemak@google.com>

Thu, 7 Jul 2016 15:56:10 +0000 (15:56 +0000)

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

Thu, 7 Jul 2016 15:56:10 +0000 (15:56 +0000)
author Dave Langemak <dlangemak@google.com>
Thu, 7 Jul 2016 15:56:10 +0000 (15:56 +0000)
committer android-build-merger <android-build-merger@google.com>
Thu, 7 Jul 2016 15:56:10 +0000 (15:56 +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	Dave Langemak <dlangemak@google.com>
	Thu, 7 Jul 2016 15:56:10 +0000 (15:56 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 7 Jul 2016 15:56:10 +0000 (15:56 +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