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

* commit 'e8a8440d70222750ad9b8563cbc80ca5c563b9c1':
  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