From: Marco Nelissen Date: Wed, 20 Aug 2014 20:16:59 +0000 (+0000) Subject: Merge "handle error during flush in MediaPlayer.reset()" into lmp-dev X-Git-Tag: android-x86-6.0-r1~852^2~454 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=111333eaab12448f45927464c8aeacbbf9a578a1;p=android-x86%2Fframeworks-av.git Merge "handle error during flush in MediaPlayer.reset()" into lmp-dev --- 111333eaab12448f45927464c8aeacbbf9a578a1