am 72df690c: am a0d41262: Merge "Copy lockTaskLaunchMode from target activity to its alias." into mnc-dev
am 72df690c: am a0d41262: Merge "Copy lockTaskLaunchMode from target activity to its alias." into mnc-dev

* commit '72df690ce07c20ef45c7a8a60b90e0ef70a1263b':
  Copy lockTaskLaunchMode from target activity to its alias.

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