Merge "Added more granular states to DATA_CHANNEL_STATE"

author Ta-wei Yen <twyen@google.com>

Wed, 27 Jan 2016 22:18:23 +0000 (22:18 +0000)

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

Wed, 27 Jan 2016 22:18:23 +0000 (22:18 +0000)
author Ta-wei Yen <twyen@google.com>
Wed, 27 Jan 2016 22:18:23 +0000 (22:18 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 27 Jan 2016 22:18:23 +0000 (22:18 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc api/test-current.txt
Simple merge
author	Ta-wei Yen <twyen@google.com>
	Wed, 27 Jan 2016 22:18:23 +0000 (22:18 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 27 Jan 2016 22:18:23 +0000 (22:18 +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