Merge "SDK API doesSwitchModemConfigTriggerReboot"

author Chen Xu <fionaxu@google.com>

Wed, 3 Apr 2019 22:17:47 +0000 (22:17 +0000)

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

Wed, 3 Apr 2019 22:17:47 +0000 (22:17 +0000)
author Chen Xu <fionaxu@google.com>
Wed, 3 Apr 2019 22:17:47 +0000 (22:17 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 3 Apr 2019 22:17:47 +0000 (22:17 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc telephony/java/android/telephony/TelephonyManager.java
Simple merge
author	Chen Xu <fionaxu@google.com>
	Wed, 3 Apr 2019 22:17:47 +0000 (22:17 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 3 Apr 2019 22:17:47 +0000 (22:17 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
telephony/java/android/telephony/TelephonyManager.java	patch \|	diff1 \|	diff2 \|	blob \| history