OSDN Git Service

am 11724dc5: am bece8116: am 01e81000: Merge "Unhide AudioTrack constructor with...
authorJean-Michel Trivi <jmtrivi@google.com>
Mon, 21 Jul 2014 18:23:46 +0000 (18:23 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 21 Jul 2014 18:23:46 +0000 (18:23 +0000)
* commit '11724dc595bb0550de376212d27909409a112cbb':
  Unhide AudioTrack constructor with AudioAttributes, AudioFormat

1  2 
api/current.txt

diff --cc api/current.txt
Simple merge