OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 66f5868 79f5cd1)
am a8b0cf1d: Unhide MediaPlayer.setAudioAttributes(), javadoc clarifications
authorJean-Michel Trivi <jmtrivi@google.com>
Wed, 16 Jul 2014 14:48:29 +0000 (14:48 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 16 Jul 2014 14:48:29 +0000 (14:48 +0000)
* commit 'a8b0cf1d53dba3e92b403af41d12aaac2a81ba49':
  Unhide MediaPlayer.setAudioAttributes(), javadoc clarifications


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help