OSDN Git Service

Merge "MediaFormat: added subtitle format" into klp-dev
authorLajos Molnar <lajos@google.com>
Fri, 16 Aug 2013 19:15:24 +0000 (19:15 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 16 Aug 2013 19:18:32 +0000 (19:18 +0000)
1  2 
api/current.txt

diff --cc api/current.txt
Simple merge