am 1ea8a351: Merge "Fix missing tag in mediaserver ServiceManager: log"
am 1ea8a351: Merge "Fix missing tag in mediaserver ServiceManager: log"

* commit '1ea8a351979194d5ffd27ee21df399349773ad30':
  Fix missing tag in mediaserver ServiceManager: log

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