tree 5db60d3ced0542b92be52f5cfe60bdb21288de7a
parent 23a6d889aa0cdcb244ccbe2b999a87e7ece7b7e5
parent a7bd93363f132fd8241d37b45498ded8004f1152
author Ricardo Cervera <rcervera@google.com> 1421439235 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1421439235 +0000

am a7bd9336: am de89f449: am ddcc2161: am c12a3e35: am 85bfcbd3: am 97c4ba98: docs: Added info on noHistory and onActivityResult().

* commit 'a7bd93363f132fd8241d37b45498ded8004f1152':
  docs: Added info on noHistory and onActivityResult().