summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice/MidiFile.cpp
diff options
context:
space:
mode:
authorChong Zhang <chz@google.com>2014-08-23 00:05:00 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-08-23 00:05:01 +0000
commit052efa490b595d17d1452ec019979996fe470a05 (patch)
tree481cb29e65c538a2d262918e33ac97bab8ed825c /media/libmediaplayerservice/MidiFile.cpp
parent43febe72dadc751acff410842e091d4099919fad (diff)
parent13d6faa02087ce3bb0d4a02b8495f1822f211433 (diff)
downloadframeworks_av-052efa490b595d17d1452ec019979996fe470a05.zip
frameworks_av-052efa490b595d17d1452ec019979996fe470a05.tar.gz
frameworks_av-052efa490b595d17d1452ec019979996fe470a05.tar.bz2
Merge "wait for flush to finish before returning setSurface" into lmp-dev
Diffstat (limited to 'media/libmediaplayerservice/MidiFile.cpp')
0 files changed, 0 insertions, 0 deletions