summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@android.com>2014-12-09 23:44:48 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-09 23:44:48 +0000
commit04c6cdbbf4719a7922d3ced85dc165690c0fd4c9 (patch)
treee1ea660ea52bb8fad05821ad2c0a55a31908b165 /media
parent33c1ffbfa03e72112fff63053b98b907950b5030 (diff)
parent9f4a2d35c710b3f3cbe594645659aa51772efd0c (diff)
downloadframeworks_av-04c6cdbbf4719a7922d3ced85dc165690c0fd4c9.zip
frameworks_av-04c6cdbbf4719a7922d3ced85dc165690c0fd4c9.tar.gz
frameworks_av-04c6cdbbf4719a7922d3ced85dc165690c0fd4c9.tar.bz2
am 9f4a2d35: am 54a6b2e1: am 56335ae2: Merge "Prevent ANR when AudioTrack is paused or re-routed"
* commit '9f4a2d35c710b3f3cbe594645659aa51772efd0c': Prevent ANR when AudioTrack is paused or re-routed
Diffstat (limited to 'media')
0 files changed, 0 insertions, 0 deletions