summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2012-05-16 08:45:52 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-05-16 08:45:52 -0700
commit8ceaedfe124f6c9e51610a7dc2270579f8264fa7 (patch)
treed1d8c0461783de6446519f8be8500bb2b1524b1e
parent53860ec9fb7df34212b3f778b4d2fb83ce1f5f1a (diff)
parent8954fb1f92d25be2b0f111f5d83a1ef311b8d579 (diff)
downloadframeworks_av-8ceaedfe124f6c9e51610a7dc2270579f8264fa7.zip
frameworks_av-8ceaedfe124f6c9e51610a7dc2270579f8264fa7.tar.gz
frameworks_av-8ceaedfe124f6c9e51610a7dc2270579f8264fa7.tar.bz2
am 8954fb1f: Reconcile with jb-release nakasi-factoryrom-release
* commit '8954fb1f92d25be2b0f111f5d83a1ef311b8d579': Fix static track activity ref counting Don't allow AudioTrack frameCount to decrease Fix race in AudioTrack destruction AudioFlinger: fix tracks ready for mixing logic. Fix regression in AudioTrack::pause() Fix ToneGenerator regression
0 files changed, 0 insertions, 0 deletions