Merge "Ensure pause when turnScreenOn flag is removed" into pi-dev

author Chavi Weingarten <chaviw@google.com>

Tue, 20 Mar 2018 01:10:53 +0000 (01:10 +0000)

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

Tue, 20 Mar 2018 01:10:53 +0000 (01:10 +0000)
author Chavi Weingarten <chaviw@google.com>
Tue, 20 Mar 2018 01:10:53 +0000 (01:10 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 20 Mar 2018 01:10:53 +0000 (01:10 +0000)
diff --cc services/core/java/com/android/server/am/ActivityStack.java
Simple merge
diff --cc services/tests/servicestests/src/com/android/server/am/ActivityStackTests.java
Simple merge
author	Chavi Weingarten <chaviw@google.com>
	Tue, 20 Mar 2018 01:10:53 +0000 (01:10 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 20 Mar 2018 01:10:53 +0000 (01:10 +0000)
		1	2
services/core/java/com/android/server/am/ActivityStack.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/tests/servicestests/src/com/android/server/am/ActivityStackTests.java	patch \|	diff1 \|	diff2 \|	blob \| history