Merge "Added a broadcast intent for clients to listen for country changes"

author Jack Yu <jackyu@google.com>

Mon, 28 Jan 2019 18:28:23 +0000 (18:28 +0000)

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

Mon, 28 Jan 2019 18:28:23 +0000 (18:28 +0000)
author Jack Yu <jackyu@google.com>
Mon, 28 Jan 2019 18:28:23 +0000 (18:28 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 28 Jan 2019 18:28:23 +0000 (18:28 +0000)
diff --cc api/current.txt
Simple merge
diff --cc telephony/java/android/telephony/TelephonyManager.java
Simple merge
author	Jack Yu <jackyu@google.com>
	Mon, 28 Jan 2019 18:28:23 +0000 (18:28 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 28 Jan 2019 18:28:23 +0000 (18:28 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
telephony/java/android/telephony/TelephonyManager.java	patch \|	diff1 \|	diff2 \|	blob \| history