tree 32b52c8f62ca1bf0969cd64e083771b6d95fdc15
parent 85dbe661a2989d1c51182b62701e412104fbfffc
parent cd05b9a27a35fcf840de2554bd35f279bddf597d
author Wei Jia <wjia@google.com> 1470446714 +0000
committer android-build-merger <android-build-merger@google.com> 1470446714 +0000

Merge "MediaPlayerService: clear output in CallbackData when recycling AudioTrack." into nyc-mr1-dev
am: cd05b9a27a

Change-Id: Id603f3a5b1c0aa5efa755753f6d9fbcf2acffc81