am 841a37aa: Merge "Clarify documentation about when...
am 841a37aa: Merge "Clarify documentation about when Activity#onCreateNavigateUpTaskStack will be called." into jb-dev
* commit '841a37aa':
Clarify documentation about when Activity#onCreateNavigateUpTaskStack will be called.