Merge "Turn down the preliminary foreground service API" into oc-dev am: 00ed0baca8

author Christopher Tate <ctate@google.com>

Tue, 18 Apr 2017 03:16:49 +0000 (03:16 +0000)

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

Tue, 18 Apr 2017 03:16:49 +0000 (03:16 +0000)
author Christopher Tate <ctate@google.com>
Tue, 18 Apr 2017 03:16:49 +0000 (03:16 +0000)
committer android-build-merger <android-build-merger@google.com>
Tue, 18 Apr 2017 03:16:49 +0000 (03:16 +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/ContextImpl.java
Simple merge
diff --cc core/java/android/content/Context.java
Simple merge
diff --cc services/core/java/com/android/server/pm/PackageManagerService.java
Simple merge
author	Christopher Tate <ctate@google.com>
	Tue, 18 Apr 2017 03:16:49 +0000 (03:16 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 18 Apr 2017 03:16:49 +0000 (03:16 +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/ContextImpl.java	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/content/Context.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/pm/PackageManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history