Robert Ly 3e770a7f92 resolved conflicts for merge of ec5ca94c to master ...

Change-Id: Id24be07a6a4abf1beec5f9dc6da6b752201c4838

2011-01-08 13:01:27 -08:00

..

appendix

Merge "Doc change: fixing links set 2"

2011-01-06 17:23:58 -08:00

basics

sdk doc change for esr: Add "resources" tab content. Fix links pointing to the old locations. Change Android.mk to output samples files to resources/samples. Misc other fixes.

2009-12-14 11:40:02 -08:00

developing

Doc change: Deleting obsolete files and adding html redirects. Modified hv and traceview docs.

2011-01-07 18:52:01 -08:00

practices

Merge "Doc change: fixing links set 3"

2011-01-06 17:24:07 -08:00

publishing

am 08e9a0fd: cherrypick Change-Id: I9e1b530b5cbd43043d326c04bfc30b073bf9d388 fix bug 3295540

2011-01-07 13:55:31 -08:00

samples

docs: fix misc broken links

2010-07-02 11:11:34 -07:00

topics

Doc change: fixing links set 2

2011-01-05 11:03:46 -08:00

tutorials

Doc Change: Fixing broken links and miscellaneous text revisions to support link fixing

2011-01-06 17:34:06 -08:00

webapps

Doc change: fixing links set 2

2011-01-05 11:03:46 -08:00

guide_toc.cs

resolved conflicts for merge of ec5ca94c to master

2011-01-08 13:01:27 -08:00

index.jd

sdk doc change for esr: Add "resources" tab content. Fix links pointing to the old locations. Change Android.mk to output samples files to resources/samples. Misc other fixes.

2009-12-14 11:40:02 -08:00