summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorChong Zhang <chz@google.com>2014-11-26 19:57:33 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-26 19:57:33 +0000
commit67d93552f0fca5a2ac6a451569cc1b1e15cd138a (patch)
treebc6cae1b1664e7ed538c1ead29b0a0c92e749f07 /services
parent059c8b62e037452ff806a0b15d693c86936d87ef (diff)
parentb438123fb1ee0a8c232fd66de658d5382d2083cf (diff)
downloadframeworks_av-67d93552f0fca5a2ac6a451569cc1b1e15cd138a.zip
frameworks_av-67d93552f0fca5a2ac6a451569cc1b1e15cd138a.tar.gz
frameworks_av-67d93552f0fca5a2ac6a451569cc1b1e15cd138a.tar.bz2
am b438123f: am 9574c274: am 5d2c5fcb: Merge "MediaCodec: resume codec if state is FLUSHED in async mode" into lmp-mr1-dev
* commit 'b438123fb1ee0a8c232fd66de658d5382d2083cf': MediaCodec: resume codec if state is FLUSHED in async mode
Diffstat (limited to 'services')
0 files changed, 0 insertions, 0 deletions