Merge "Enforce platform level animation in CrossProfileApps.startMainActivity"

author TreeHugger Robot <treehugger-gerrit@google.com>

Fri, 22 Dec 2017 11:24:28 +0000 (11:24 +0000)

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

Fri, 22 Dec 2017 11:24:28 +0000 (11:24 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Fri, 22 Dec 2017 11:24:28 +0000 (11:24 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 22 Dec 2017 11:24:28 +0000 (11:24 +0000)
diff --cc api/current.txt
Simple merge
diff --cc core/res/res/values/symbols.xml
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Fri, 22 Dec 2017 11:24:28 +0000 (11:24 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 22 Dec 2017 11:24:28 +0000 (11:24 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/res/values/symbols.xml	patch \|	diff1 \|	diff2 \|	blob \| history