Skip to content
Commit 90312d80 authored by Ricardo Cervera's avatar Ricardo Cervera Committed by Android Git Automerger
Browse files

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

* commit '22878790':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
parents 8a7f20f5 22878790
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment