Merge "Added 'dumpsys activity lastanr'" into oc-dev

author Wale Ogunwale <ogunwale@google.com>

Sat, 10 Jun 2017 16:05:53 +0000 (16:05 +0000)

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

Sat, 10 Jun 2017 16:05:53 +0000 (16:05 +0000)
author Wale Ogunwale <ogunwale@google.com>
Sat, 10 Jun 2017 16:05:53 +0000 (16:05 +0000)
committer android-build-merger <android-build-merger@google.com>
Sat, 10 Jun 2017 16:05:53 +0000 (16:05 +0000)
diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
diff --cc services/core/java/com/android/server/wm/WindowManagerService.java
Simple merge
author	Wale Ogunwale <ogunwale@google.com>
	Sat, 10 Jun 2017 16:05:53 +0000 (16:05 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Sat, 10 Jun 2017 16:05:53 +0000 (16:05 +0000)
		1	2
services/core/java/com/android/server/am/ActivityManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/wm/WindowManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history