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

* commit '841a37aa5b6684ea8738f97b7e99a152bc6d5c7a':
  Clarify documentation about when Activity#onCreateNavigateUpTaskStack will be called.

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