Merge "Mark EXTRA_INCOMING_NUMBER for PHONE_STATE broadcast as deprecated."

author Tyler Gunn <tgunn@google.com>

Mon, 18 Mar 2019 22:46:56 +0000 (15:46 -0700)

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

Mon, 18 Mar 2019 22:46:56 +0000 (15:46 -0700)
author Tyler Gunn <tgunn@google.com>
Mon, 18 Mar 2019 22:46:56 +0000 (15:46 -0700)
committer android-build-merger <android-build-merger@google.com>
Mon, 18 Mar 2019 22:46:56 +0000 (15:46 -0700)
diff --cc api/current.txt
Simple merge
diff --cc telephony/java/android/telephony/TelephonyManager.java
Simple merge
author	Tyler Gunn <tgunn@google.com>
	Mon, 18 Mar 2019 22:46:56 +0000 (15:46 -0700)
committer	android-build-merger <android-build-merger@google.com>
	Mon, 18 Mar 2019 22:46:56 +0000 (15:46 -0700)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
telephony/java/android/telephony/TelephonyManager.java	patch \|	diff1 \|	diff2 \|	blob \| history