Elliott Hughes 4656e69bf3 resolved conflicts for merge of 2008cff7 to lmp-dev-plus-aosp ...

Change-Id: I5148eda624e8504f12dbc1288cd4a7a5b7c10850

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

..

appendix

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

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

components

am c1da9cbf: am 2c374e64: am 82957e38: Merge "docs: Fixed typo in intents page. Bug: 16949177" into klp-modular-docs

2014-08-21 17:44:53 +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

docs: fix broken links

2012-07-31 14:19:33 -07:00

topics

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

2014-09-08 13:08:43 -07: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