Merge "Deliver new activity options after the activity is made visible" into nyc-dev

author Chong Zhang <chz@google.com>

Wed, 11 May 2016 21:51:04 +0000 (21:51 +0000)

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

Wed, 11 May 2016 21:51:05 +0000 (21:51 +0000)
author Chong Zhang <chz@google.com>
Wed, 11 May 2016 21:51:04 +0000 (21:51 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 11 May 2016 21:51:05 +0000 (21:51 +0000)
diff --cc services/core/java/com/android/server/am/ActivityStack.java
Simple merge
author	Chong Zhang <chz@google.com>
	Wed, 11 May 2016 21:51:04 +0000 (21:51 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 11 May 2016 21:51:05 +0000 (21:51 +0000)