am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 automerge: e8f6bd48 automerge: eada048a * commit 'eada048a':