am 4816ebe8: am e8a8440d: am f1207122: Merge "MediaPlayer: provide mime type for all track types" into mnc-dev
am 4816ebe8: am e8a8440d: am f1207122: Merge "MediaPlayer: provide mime type for all track types" into mnc-dev

* commit '4816ebe8c2f312bca44d95abdfec0dba137c4fd4':
  MediaPlayer: provide mime type for all track types

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