Merge "Rename to follow API council guidance." into oc-dev am: 0d6c3a691e

author Jeff Sharkey <jsharkey@android.com>

Mon, 1 May 2017 23:36:36 +0000 (23:36 +0000)

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

Mon, 1 May 2017 23:36:36 +0000 (23:36 +0000)
author Jeff Sharkey <jsharkey@android.com>
Mon, 1 May 2017 23:36:36 +0000 (23:36 +0000)
committer android-build-merger <android-build-merger@google.com>
Mon, 1 May 2017 23:36:36 +0000 (23:36 +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 services/core/java/com/android/server/pm/PackageManagerService.java
Simple merge
author	Jeff Sharkey <jsharkey@android.com>
	Mon, 1 May 2017 23:36:36 +0000 (23:36 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Mon, 1 May 2017 23:36:36 +0000 (23:36 +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
services/core/java/com/android/server/pm/PackageManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history