Ricardo Cervera 1e59b338e6 am 08314642: am 90312d80: am 22878790: am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev
* commit '083146428420dd3daa887d6e9c019e747a604cb5':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
2015-01-16 18:47:08 +00:00
..