Merge "Hide WallpaperService.Engine colors API." into oc-dr1-dev am: 1133cf2b8a

author Lucas Dupin <dupin@google.com>

Fri, 16 Jun 2017 04:58:21 +0000 (04:58 +0000)

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

Fri, 16 Jun 2017 04:58:21 +0000 (04:58 +0000)
author Lucas Dupin <dupin@google.com>
Fri, 16 Jun 2017 04:58:21 +0000 (04:58 +0000)
committer android-build-merger <android-build-merger@google.com>
Fri, 16 Jun 2017 04:58:21 +0000 (04:58 +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	Lucas Dupin <dupin@google.com>
	Fri, 16 Jun 2017 04:58:21 +0000 (04:58 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 16 Jun 2017 04:58:21 +0000 (04:58 +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