Merge "Renamed NetworkRegistrationState to NetworkRegistrationInfo"

author Jack Yu <jackyu@google.com>

Wed, 20 Mar 2019 06:30:53 +0000 (06:30 +0000)

committer Gerrit Code Review <noreply-gerritcodereview@google.com>

Wed, 20 Mar 2019 06:30:53 +0000 (06:30 +0000)
author Jack Yu <jackyu@google.com>
Wed, 20 Mar 2019 06:30:53 +0000 (06:30 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 20 Mar 2019 06:30:53 +0000 (06:30 +0000)
diff --cc api/system-current.txt
Simple merge
diff --cc telephony/java/android/telephony/ServiceState.java
Simple merge
author	Jack Yu <jackyu@google.com>
	Wed, 20 Mar 2019 06:30:53 +0000 (06:30 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Wed, 20 Mar 2019 06:30:53 +0000 (06:30 +0000)
		1	2
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
telephony/java/android/telephony/ServiceState.java	patch \|	diff1 \|	diff2 \|	blob \| history