Merge "Add Configuration param to onMovedToDisplay"

author Andrii Kulian <akulian@google.com>

Tue, 28 Mar 2017 17:26:35 +0000 (17:26 +0000)

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

Tue, 28 Mar 2017 17:26:41 +0000 (17:26 +0000)
author Andrii Kulian <akulian@google.com>
Tue, 28 Mar 2017 17:26:35 +0000 (17:26 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 28 Mar 2017 17:26:41 +0000 (17:26 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc api/test-current.txt
Simple merge
diff --cc core/java/android/app/ActivityThread.java
Simple merge
author	Andrii Kulian <akulian@google.com>
	Tue, 28 Mar 2017 17:26:35 +0000 (17:26 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 28 Mar 2017 17:26:41 +0000 (17:26 +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
core/java/android/app/ActivityThread.java	patch \|	diff1 \|	diff2 \|	blob \| history