Merge "Account for content insets in source rect hint for transition into PiP" into...

author Winson Chung <winsonc@google.com>

Tue, 18 Apr 2017 01:40:59 +0000 (01:40 +0000)

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

Tue, 18 Apr 2017 01:40:59 +0000 (01:40 +0000)
author Winson Chung <winsonc@google.com>
Tue, 18 Apr 2017 01:40:59 +0000 (01:40 +0000)
committer android-build-merger <android-build-merger@google.com>
Tue, 18 Apr 2017 01:40:59 +0000 (01:40 +0000)
diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
author	Winson Chung <winsonc@google.com>
	Tue, 18 Apr 2017 01:40:59 +0000 (01:40 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 18 Apr 2017 01:40:59 +0000 (01:40 +0000)