Merge "Updated javadocs for sendUssd APIs."

author Chen Xu <fionaxu@google.com>

Fri, 28 Apr 2017 17:26:11 +0000 (17:26 +0000)

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

Fri, 28 Apr 2017 17:26:13 +0000 (17:26 +0000)
author Chen Xu <fionaxu@google.com>
Fri, 28 Apr 2017 17:26:11 +0000 (17:26 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 28 Apr 2017 17:26:13 +0000 (17:26 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc api/test-current.txt
Simple merge
diff --cc telephony/java/android/telephony/TelephonyManager.java
Simple merge
author	Chen Xu <fionaxu@google.com>
	Fri, 28 Apr 2017 17:26:11 +0000 (17:26 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Fri, 28 Apr 2017 17:26:13 +0000 (17:26 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/test-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
telephony/java/android/telephony/TelephonyManager.java	patch \|	diff1 \|	diff2 \|	blob \| history