tree c83962c206b640277180166f617b5f26b4f6d088
parent 64baa7025da1c12dec1e55216d0fe32bd9e0e8c1
parent ceadb1a86a00475d572a99053a0dcbd5bcc2f93d
author Makoto Onuki <omakoto@google.com> 1468974282 +0000
committer android-build-merger <android-build-merger@google.com> 1468974282 +0000

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

Change-Id: If26f5a2e8f2a0533b145025734e5819e72a48b28