Merge "Prevent NPE in startActivityUnchecked" into oc-dev

author Fyodor Kupolov <fkupolov@google.com>

Wed, 3 May 2017 20:59:04 +0000 (20:59 +0000)

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

Wed, 3 May 2017 20:59:09 +0000 (20:59 +0000)
author Fyodor Kupolov <fkupolov@google.com>
Wed, 3 May 2017 20:59:04 +0000 (20:59 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 3 May 2017 20:59:09 +0000 (20:59 +0000)
diff --cc services/core/java/com/android/server/am/ActivityStarter.java
Simple merge
author	Fyodor Kupolov <fkupolov@google.com>
	Wed, 3 May 2017 20:59:04 +0000 (20:59 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 3 May 2017 20:59:09 +0000 (20:59 +0000)