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

author	Jean-Michel Trivi <jmtrivi@google.com>
	Wed, 16 Jul 2014 14:52:55 +0000 (14:52 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Wed, 16 Jul 2014 14:52:55 +0000 (14:52 +0000)

* commit 'e3033232311395bf23ee25b8308992ce5aa2df28':
Unhide MediaPlayer.setAudioAttributes(), javadoc clarifications

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

Simple merge

frameworks/base

About OSDN

Find Software

Develop Software

Help