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

* commit '4af0945647573b7aacbd014effc9bb0353608447':
  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