Merge "Remove rotation and app bounds from Configuration diff." into oc-dr1-dev

author Bryce Lee <brycelee@google.com>

Fri, 28 Jul 2017 21:28:05 +0000 (21:28 +0000)

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

Fri, 28 Jul 2017 21:28:05 +0000 (21:28 +0000)
author Bryce Lee <brycelee@google.com>
Fri, 28 Jul 2017 21:28:05 +0000 (21:28 +0000)
committer android-build-merger <android-build-merger@google.com>
Fri, 28 Jul 2017 21:28:05 +0000 (21:28 +0000)
diff --cc core/java/android/content/pm/ActivityInfo.java
Simple merge
diff --cc core/java/android/view/Surface.java
Simple merge
diff --cc services/core/java/com/android/server/am/ActivityRecord.java
Simple merge
author	Bryce Lee <brycelee@google.com>
	Fri, 28 Jul 2017 21:28:05 +0000 (21:28 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 28 Jul 2017 21:28:05 +0000 (21:28 +0000)
		1	2
core/java/android/content/pm/ActivityInfo.java	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/view/Surface.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/am/ActivityRecord.java	patch \|	diff1 \|	diff2 \|	blob \| history