am 6d3cff12: Merge "MediaCodec: Added E-AC3 mime type (@hide)." into lmp-mr1-dev automerge: b60bb35
am 6d3cff12: Merge "MediaCodec: Added E-AC3 mime type (@hide)." into lmp-mr1-dev
automerge: b60bb35

* commit 'b60bb35650c7075bc66bf2b8f5c0fbe428092010':
  MediaCodec: Added E-AC3 mime type (@hide).

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