Merge "Expose a new public column network_type_bitmask and deprecate bearer_bitmask...

author Cassie Han <xih@google.com>

Wed, 10 Jan 2018 00:55:32 +0000 (00:55 +0000)

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

Wed, 10 Jan 2018 00:55:32 +0000 (00:55 +0000)
author Cassie Han <xih@google.com>
Wed, 10 Jan 2018 00:55:32 +0000 (00:55 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 10 Jan 2018 00:55:32 +0000 (00:55 +0000)
diff --cc api/current.txt
Simple merge
diff --cc telephony/java/android/telephony/Telephony.java
Simple merge
author	Cassie Han <xih@google.com>
	Wed, 10 Jan 2018 00:55:32 +0000 (00:55 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Wed, 10 Jan 2018 00:55:32 +0000 (00:55 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
telephony/java/android/telephony/Telephony.java	patch \|	diff1 \|	diff2 \|	blob \| history