am 7c002d75: am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 automerge: e8f6bd4 automerge: eada048 automerge: 458f432 automerge: 47e274c automerge: 046dc08
automerge: 115759a

* commit '115759a3894eeede288fa1a7e5c3a09879bfe777':