summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2014-08-20 20:16:59 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-08-19 02:43:23 +0000
commit111333eaab12448f45927464c8aeacbbf9a578a1 (patch)
tree845d25bdc67513f1f0292a0d66242a7fb73e5dda /include
parent4deb606bca47f971f1ca05e44b934c5328cfb6b7 (diff)
parent9e2b7918eb5621b24bd54c922f630da45339de77 (diff)
downloadframeworks_av-111333eaab12448f45927464c8aeacbbf9a578a1.zip
frameworks_av-111333eaab12448f45927464c8aeacbbf9a578a1.tar.gz
frameworks_av-111333eaab12448f45927464c8aeacbbf9a578a1.tar.bz2
Merge "handle error during flush in MediaPlayer.reset()" into lmp-dev
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions