am e9e31f89: am b9705893: am 204b1e28: am fe470c37: Merge "Have the package manager write mimetype of preferred activities to xml." into klp-dev
am e9e31f89: am b9705893: am 204b1e28: am fe470c37: Merge "Have the package manager write mimetype of preferred activities to xml." into klp-dev

* commit 'e9e31f895e45beffded847a7fc4f7e4c948c4c8d':
  Have the package manager write mimetype of preferred activities to xml.

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