Merge "Rename READ_PHONE_NUMBER to READ_PHONE_NUMBERS" into oc-dev

author Chad Brubaker <cbrubaker@google.com>

Mon, 3 Apr 2017 17:34:03 +0000 (17:34 +0000)

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

Mon, 3 Apr 2017 17:34:13 +0000 (17:34 +0000)
author Chad Brubaker <cbrubaker@google.com>
Mon, 3 Apr 2017 17:34:03 +0000 (17:34 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 3 Apr 2017 17:34:13 +0000 (17:34 +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/res/res/values/strings.xml
Simple merge
diff --cc services/core/java/com/android/server/pm/PackageManagerService.java
Simple merge
author	Chad Brubaker <cbrubaker@google.com>
	Mon, 3 Apr 2017 17:34:03 +0000 (17:34 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 3 Apr 2017 17:34:13 +0000 (17:34 +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/res/res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/pm/PackageManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history