Merge "Make the MIDI Manager optional, enabled by "android.software.midi" feature"

author Mike Lockwood <lockwood@google.com>

Sat, 28 Mar 2015 16:00:19 +0000 (16:00 +0000)

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

Sat, 28 Mar 2015 16:00:21 +0000 (16:00 +0000)
author Mike Lockwood <lockwood@google.com>
Sat, 28 Mar 2015 16:00:19 +0000 (16:00 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Sat, 28 Mar 2015 16:00:21 +0000 (16:00 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
author	Mike Lockwood <lockwood@google.com>
	Sat, 28 Mar 2015 16:00:19 +0000 (16:00 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Sat, 28 Mar 2015 16:00:21 +0000 (16:00 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history