Merge "media: add MediaFormat.KEY_PRIORITY."

author Ronghua Wu <ronghuawu@google.com>

Mon, 16 Mar 2015 16:38:24 +0000 (16:38 +0000)

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

Mon, 16 Mar 2015 16:38:25 +0000 (16:38 +0000)
author Ronghua Wu <ronghuawu@google.com>
Mon, 16 Mar 2015 16:38:24 +0000 (16:38 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 16 Mar 2015 16:38:25 +0000 (16:38 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
author	Ronghua Wu <ronghuawu@google.com>
	Mon, 16 Mar 2015 16:38:24 +0000 (16:38 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 16 Mar 2015 16:38:25 +0000 (16:38 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history