OSDN Git Service

am dad0f462: Merge "MediaFormat: added subtitle format" into klp-dev
authorLajos Molnar <lajos@google.com>
Fri, 16 Aug 2013 19:23:56 +0000 (12:23 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 16 Aug 2013 19:23:56 +0000 (12:23 -0700)
* commit 'dad0f462ae6fee99840bbea910c810282bbc1c54':
  MediaFormat: added subtitle format


Trivial merge