Merge "Add system config to specify Multi-Display support" into oc-dev

author Andrii Kulian <akulian@google.com>

Fri, 7 Apr 2017 00:22:37 +0000 (00:22 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Fri, 7 Apr 2017 00:22:44 +0000 (00:22 +0000)
author Andrii Kulian <akulian@google.com>
Fri, 7 Apr 2017 00:22:37 +0000 (00:22 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 7 Apr 2017 00:22:44 +0000 (00:22 +0000)
diff --cc core/res/res/values/symbols.xml
Simple merge
diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
author	Andrii Kulian <akulian@google.com>
	Fri, 7 Apr 2017 00:22:37 +0000 (00:22 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 7 Apr 2017 00:22:44 +0000 (00:22 +0000)
		1	2
core/res/res/values/symbols.xml	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/am/ActivityManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history