Merge "Add bluetooth folder type information to MediaDescription and MediaMetadata"

author Donghyun Cho <donghyun@google.com>

Fri, 17 Jun 2016 02:03:12 +0000 (02:03 +0000)

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

Fri, 17 Jun 2016 02:03:14 +0000 (02:03 +0000)
author Donghyun Cho <donghyun@google.com>
Fri, 17 Jun 2016 02:03:12 +0000 (02:03 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 17 Jun 2016 02:03:14 +0000 (02:03 +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	Donghyun Cho <donghyun@google.com>
	Fri, 17 Jun 2016 02:03:12 +0000 (02:03 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 17 Jun 2016 02:03:14 +0000 (02:03 +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