Merge "Disallow task snapshot starting window for intent != ACTION_MAIN" into oc-dev

author Jorim Jaggi <jjaggi@google.com>

Wed, 12 Apr 2017 17:06:10 +0000 (17:06 +0000)

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

Wed, 12 Apr 2017 17:06:15 +0000 (17:06 +0000)
author Jorim Jaggi <jjaggi@google.com>
Wed, 12 Apr 2017 17:06:10 +0000 (17:06 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 12 Apr 2017 17:06:15 +0000 (17:06 +0000)
diff --cc services/core/java/com/android/server/am/ActivityStack.java
Simple merge
author	Jorim Jaggi <jjaggi@google.com>
	Wed, 12 Apr 2017 17:06:10 +0000 (17:06 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 12 Apr 2017 17:06:15 +0000 (17:06 +0000)