tree 14d52fb8e39a9b650ea348efcbfc53db6d3ae6ff
parent ae15e779c0a0a9005292efb0f39729454429fa7f
parent 458f4326bdff638cefe175b179a487872cf678c1
author Ricardo Cervera <rcervera@google.com> 1421777449 +0000
committer android-build-merger <android-build-merger@google.com> 1421777449 +0000

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

* commit '458f4326bdff638cefe175b179a487872cf678c1':