am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256
automerge: e8f6bd4

* commit 'e8f6bd484627e16fa2fd9509b0f06056ee44be94':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256