git.osdn.net Git - android-x86/frameworks-base.git/commitdiff

author	Jeff Tinker <jtinker@google.com>
	Thu, 22 Aug 2013 23:17:16 +0000 (16:17 -0700)
committer	Android Git Automerger <android-git-automerger@android.com>
	Thu, 22 Aug 2013 23:17:16 +0000 (16:17 -0700)

* commit '2efb6cb7397b6a2ac634d091f20b3466411f103c':
Add ability to test supported content types to MediaDrm

		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge

frameworks/base

About OSDN

Find Software

Develop Software

Help