am 68ca59e9: am b0ef1442: Merge "Fix issue #258640: Automatic propagation of FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET" into froyo

Merge commit '68ca59e9e69ab4c997987fb0390382a2461386eb' into kraken

* commit '68ca59e9e69ab4c997987fb0390382a2461386eb':
  Fix issue #258640: Automatic propagation of FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET