Merge "Fixing issue with wrong initial multi-window mode." into oc-dev

author Winson Chung <winsonc@google.com>

Tue, 9 May 2017 03:58:02 +0000 (03:58 +0000)

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

Tue, 9 May 2017 03:58:09 +0000 (03:58 +0000)
author Winson Chung <winsonc@google.com>
Tue, 9 May 2017 03:58:02 +0000 (03:58 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 9 May 2017 03:58:09 +0000 (03:58 +0000)
diff --cc services/core/java/com/android/server/am/ActivityRecord.java
Simple merge
author	Winson Chung <winsonc@google.com>
	Tue, 9 May 2017 03:58:02 +0000 (03:58 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 9 May 2017 03:58:09 +0000 (03:58 +0000)