am 03466e35: Merge "Adds handler type \'sbtl\' to support subtitles in various containers."
am 03466e35: Merge "Adds handler type \'sbtl\' to support subtitles in various containers."

* commit '03466e35f2996fd3330452e38984f0012239305e':
  Adds handler type 'sbtl' to support subtitles in various containers.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base