Merge "remove Intent.FLAG_ACTIVITY_NEW_TASK flag check" into nyc-mr1-dev

author Wei Wang <wvw@google.com>

Sat, 18 Jun 2016 00:19:40 +0000 (00:19 +0000)

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

Sat, 18 Jun 2016 00:19:41 +0000 (00:19 +0000)
author Wei Wang <wvw@google.com>
Sat, 18 Jun 2016 00:19:40 +0000 (00:19 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Sat, 18 Jun 2016 00:19:41 +0000 (00:19 +0000)
diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
author	Wei Wang <wvw@google.com>
	Sat, 18 Jun 2016 00:19:40 +0000 (00:19 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Sat, 18 Jun 2016 00:19:41 +0000 (00:19 +0000)