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

..

appendix

resolved conflicts for merge of 2008cff7 to lmp-dev-plus-aosp

2014-09-08 13:08:43 -07:00

components

docs: Fix broken link in Common Intents

2015-01-13 08:28:22 -08:00

faq

resolved conflicts for merge of 2008cff7 to lmp-dev-plus-aosp

2014-09-08 13:08:43 -07:00

practices

docs: b/15790433 updated for xxhdpi and xxxhdpi

2014-08-08 14:06:22 -07:00

samples

…

topics

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

2015-01-16 18:47:08 +00:00

webapps

update web app docs to remove target-densitydpi,

2013-11-01 12:11:59 -07:00

guide_toc.cs

docs: Recents screen for tasks and activities

2014-10-16 22:16:13 -07:00

index.jd

initial shuffle of the API guide nav to add introduction

2013-12-17 13:14:17 -08:00