Merge "Add config to allow start activities on long press." into pi-dev

author Michael Kwan <mkwan@google.com>

Mon, 9 Apr 2018 16:58:51 +0000 (16:58 +0000)

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

Mon, 9 Apr 2018 16:58:51 +0000 (16:58 +0000)
author Michael Kwan <mkwan@google.com>
Mon, 9 Apr 2018 16:58:51 +0000 (16:58 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 9 Apr 2018 16:58:51 +0000 (16:58 +0000)
diff --cc core/res/res/values/config.xml
Simple merge
diff --cc core/res/res/values/symbols.xml
Simple merge
diff --cc services/core/java/com/android/server/policy/PhoneWindowManager.java
Simple merge
author	Michael Kwan <mkwan@google.com>
	Mon, 9 Apr 2018 16:58:51 +0000 (16:58 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 9 Apr 2018 16:58:51 +0000 (16:58 +0000)
		1	2
core/res/res/values/config.xml	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/res/values/symbols.xml	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/policy/PhoneWindowManager.java	patch \|	diff1 \|	diff2 \|	blob \| history