Merge "Add new Download Error Codes"

author Brad Ebinger <breadley@google.com>

Wed, 11 Oct 2017 22:12:26 +0000 (22:12 +0000)

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

Wed, 11 Oct 2017 22:12:26 +0000 (22:12 +0000)
author Brad Ebinger <breadley@google.com>
Wed, 11 Oct 2017 22:12:26 +0000 (22:12 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 11 Oct 2017 22:12:26 +0000 (22:12 +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/MbmsDownloadSession.java
Simple merge
author	Brad Ebinger <breadley@google.com>
	Wed, 11 Oct 2017 22:12:26 +0000 (22:12 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Wed, 11 Oct 2017 22:12:26 +0000 (22:12 +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/MbmsDownloadSession.java	patch \|	diff1 \|	diff2 \|	blob \| history