Nick Kralevich 0763a03d22 am 0ae82b05: resolved conflicts for merge of a4eb81b6 to lmp-dev ...

* commit '0ae82b05be47df85551a1c759a93e84c8009947c':
  Docs: adding closing bracket to un-break javadoc tokens.

2014-10-14 15:50:15 +00:00

..

appendix

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

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

components

am a18075e8: am bd964cad: docs: Removing references to self note on Common Intents page.

2014-10-07 23:49:06 +00: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 0ae82b05: resolved conflicts for merge of a4eb81b6 to lmp-dev

2014-10-14 15:50:15 +00:00

webapps

update web app docs to remove target-densitydpi,

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

guide_toc.cs

ExoPlayer developer guide

2014-06-20 14:28:54 -07:00

index.jd

initial shuffle of the API guide nav to add introduction

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