tree 88bd466ecfa59e6338d84bb7df92fb94ee261664
parent 8a7f20f5a4d83580470133a9a325a66edbb7363e
parent 2287879039556ad3c8fce58974e2396b4a2dab45
author Ricardo Cervera <rcervera@google.com> 1421433405 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1421433405 +0000

am 22878790: am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev

* commit '2287879039556ad3c8fce58974e2396b4a2dab45':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256