am af13d3b0: am 826bf9b6: Merge "media: parse max-concurrent-instances." into mnc-dev
am af13d3b0: am 826bf9b6: Merge "media: parse max-concurrent-instances." into mnc-dev

* commit 'af13d3b009c5c39f6d4fa8d54fab724fdea73910':
  media: parse max-concurrent-instances.

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