Merge "Hide periodic scanning" am: ca7544ea15 am: c06722e788

author Jakub Pawlowski <jpawlowski@google.com>

Thu, 30 Mar 2017 03:35:53 +0000 (03:35 +0000)

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

Thu, 30 Mar 2017 03:35:53 +0000 (03:35 +0000)
author Jakub Pawlowski <jpawlowski@google.com>
Thu, 30 Mar 2017 03:35:53 +0000 (03:35 +0000)
committer android-build-merger <android-build-merger@google.com>
Thu, 30 Mar 2017 03:35:53 +0000 (03:35 +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	Jakub Pawlowski <jpawlowski@google.com>
	Thu, 30 Mar 2017 03:35:53 +0000 (03:35 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 30 Mar 2017 03:35:53 +0000 (03:35 +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