Merge "Create Public API which exposes if the device is in a state where simultaneous...

author Pankaj Kanwar <pkanwar@google.com>

Tue, 25 Apr 2017 23:30:51 +0000 (23:30 +0000)

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

Tue, 25 Apr 2017 23:30:53 +0000 (23:30 +0000)
author Pankaj Kanwar <pkanwar@google.com>
Tue, 25 Apr 2017 23:30:51 +0000 (23:30 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 25 Apr 2017 23:30:53 +0000 (23:30 +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
diff --cc telephony/java/com/android/internal/telephony/ITelephony.aidl
Simple merge
author	Pankaj Kanwar <pkanwar@google.com>
	Tue, 25 Apr 2017 23:30:51 +0000 (23:30 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Tue, 25 Apr 2017 23:30:53 +0000 (23:30 +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
telephony/java/com/android/internal/telephony/ITelephony.aidl	patch \|	diff1 \|	diff2 \|	blob \| history