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

* commit '458f4326bdff638cefe175b179a487872cf678c1':