am 681e0150: am 0505ebbc: am 8869d6f3: Merge "Extend preferred-app preload support for complex resolutions" into klp-dev
am 681e0150: am 0505ebbc: am 8869d6f3: Merge "Extend preferred-app preload support for complex resolutions" into klp-dev

* commit '681e015061f0c153c9e886ca2181deea0a0ecee8':
  Extend preferred-app preload support for complex resolutions

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