Merge "Fix issue #37306208: CTS: ServiceTest#testForegroundService..." into oc-dev

author Dianne Hackborn <hackbod@google.com>

Wed, 19 Apr 2017 22:20:52 +0000 (22:20 +0000)

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

Wed, 19 Apr 2017 22:20:57 +0000 (22:20 +0000)
author Dianne Hackborn <hackbod@google.com>
Wed, 19 Apr 2017 22:20:52 +0000 (22:20 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 19 Apr 2017 22:20:57 +0000 (22:20 +0000)
diff --cc services/core/java/com/android/server/am/ActiveServices.java
Simple merge
diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
author	Dianne Hackborn <hackbod@google.com>
	Wed, 19 Apr 2017 22:20:52 +0000 (22:20 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 19 Apr 2017 22:20:57 +0000 (22:20 +0000)
		1	2
services/core/java/com/android/server/am/ActiveServices.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/am/ActivityManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history