tree fcf951e96ead62f6808fcddc3c05508ea1fdb6e3
parent 2287879039556ad3c8fce58974e2396b4a2dab45
parent 85bfcbd3e2367768c1d026cbba6fe0fa9a6b2dae
author Ricardo Cervera <rcervera@google.com> 1421434659 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1421434659 +0000

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

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