Merge "Mark EXTRA_INCOMING_NUMBER for PHONE_STATE broadcast as deprecated." am: e2a48...

author Tyler Gunn <tgunn@google.com>

Mon, 18 Mar 2019 23:06:46 +0000 (16:06 -0700)

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

Mon, 18 Mar 2019 23:06:46 +0000 (16:06 -0700)
author Tyler Gunn <tgunn@google.com>
Mon, 18 Mar 2019 23:06:46 +0000 (16:06 -0700)
committer android-build-merger <android-build-merger@google.com>
Mon, 18 Mar 2019 23:06:46 +0000 (16:06 -0700)
diff --cc api/current.txt

index 53d10bb,3a68cc5..00ce8df

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