Merge commit 'afdc85f65d2952d3ec3be5e1ae2c4209938fc196' into gingerbread-plus-aosp * commit 'afdc85f65d2952d3ec3be5e1ae2c4209938fc196': Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes.
Merge commit 'afdc85f65d2952d3ec3be5e1ae2c4209938fc196' into gingerbread-plus-aosp * commit 'afdc85f65d2952d3ec3be5e1ae2c4209938fc196': Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes.