Merge "Use feature instead of hidden config for multi-display" into oc-dev

author Andrii Kulian <akulian@google.com>

Sat, 8 Apr 2017 02:00:57 +0000 (02:00 +0000)

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

Sat, 8 Apr 2017 02:00:57 +0000 (02:00 +0000)
author Andrii Kulian <akulian@google.com>
Sat, 8 Apr 2017 02:00:57 +0000 (02:00 +0000)
committer android-build-merger <android-build-merger@google.com>
Sat, 8 Apr 2017 02:00:57 +0000 (02:00 +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	Andrii Kulian <akulian@google.com>
	Sat, 8 Apr 2017 02:00:57 +0000 (02:00 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Sat, 8 Apr 2017 02:00:57 +0000 (02:00 +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