Merge "Moved transport to IntDef"

author Jack Yu <jackyu@google.com>

Fri, 15 Mar 2019 21:16:42 +0000 (21:16 +0000)

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

Fri, 15 Mar 2019 21:16:42 +0000 (21:16 +0000)
author Jack Yu <jackyu@google.com>
Fri, 15 Mar 2019 21:16:42 +0000 (21:16 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 15 Mar 2019 21:16:42 +0000 (21:16 +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>
	Fri, 15 Mar 2019 21:16:42 +0000 (21:16 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 15 Mar 2019 21:16:42 +0000 (21:16 +0000)
		1	2
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
telephony/java/android/telephony/ServiceState.java	patch \|	diff1 \|	diff2 \|	blob \| history