summaryrefslogtreecommitdiffstats
path: root/MODULE_LICENSE_APACHE2
diff options
context:
space:
mode:
authorRonghua Wu <ronghuawu@google.com>2014-10-03 21:54:42 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-03 21:54:42 +0000
commite9c83ef28c876389812b69ef9625305066ec5fd3 (patch)
treebc6e7b47da525ed2764d42912cf289cd1dc8f091 /MODULE_LICENSE_APACHE2
parent4d9aba92e64eed4e09431a6544df27ab0b7ceff8 (diff)
parentaf1a4dc989d6707116eaefab300ad55124aace66 (diff)
downloadframeworks_av-e9c83ef28c876389812b69ef9625305066ec5fd3.zip
frameworks_av-e9c83ef28c876389812b69ef9625305066ec5fd3.tar.gz
frameworks_av-e9c83ef28c876389812b69ef9625305066ec5fd3.tar.bz2
am af1a4dc9: Merge "NuPlayer: don\'t restart AudioSink when torn down due to pause timeout." into lmp-dev
* commit 'af1a4dc989d6707116eaefab300ad55124aace66': NuPlayer: don't restart AudioSink when torn down due to pause timeout.
Diffstat (limited to 'MODULE_LICENSE_APACHE2')
0 files changed, 0 insertions, 0 deletions