Commits
Ricardo Cervera authored and Android Git Automerger committed 90312d808f4M
am 22878790: am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev * commit '2287879039556ad3c8fce58974e2396b4a2dab45': docs: Added info on noHistory and onActivityResult(). Bug: 13807256
Showing diff to8a7f20f5a4d