Merge \\"Stop adding FLAG_ACTIVITY_RESET_TASK_IF_NEEDED when...\\" into nyc-mr1-dev...

author Makoto Onuki <omakoto@google.com>

Wed, 20 Jul 2016 00:32:17 +0000 (00:32 +0000)

committer android-build-merger <android-build-merger@google.com>

Wed, 20 Jul 2016 00:32:17 +0000 (00:32 +0000)
author Makoto Onuki <omakoto@google.com>
Wed, 20 Jul 2016 00:32:17 +0000 (00:32 +0000)
committer android-build-merger <android-build-merger@google.com>
Wed, 20 Jul 2016 00:32:17 +0000 (00:32 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc api/test-current.txt
Simple merge
author	Makoto Onuki <omakoto@google.com>
	Wed, 20 Jul 2016 00:32:17 +0000 (00:32 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Wed, 20 Jul 2016 00:32:17 +0000 (00:32 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/test-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history