Scott Main 88ffe75acd resolved conflicts for merge of 438fdfe8 to master

2009-09-03 09:41:39 -07:00

..

appendix

am 2fcba612: am 618ded26: am a6602f1f: Add docs for SDK update. Add redirects for preview files. Manually integrate a few doc changes from cupcake.

2009-09-02 19:18:57 -07:00

basics

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

developing

resolved conflicts for merge of 438fdfe8 to master

2009-09-03 09:41:39 -07:00

practices

Fix all typos (found by script) in the Android documentation.

2009-08-21 13:10:55 -07:00

publishing

resolved conflicts for merge of 438fdfe8 to master

2009-09-03 09:41:39 -07:00

samples

add searchable dictionary to html docs and dev guide nav

2009-08-29 13:25:19 -07:00

topics

am 2fcba612: am 618ded26: am a6602f1f: Add docs for SDK update. Add redirects for preview files. Manually integrate a few doc changes from cupcake.

2009-09-02 19:18:57 -07:00

tutorials

manual merge of 85a2c7f because of trivial conflict

2009-09-01 13:52:19 -07:00

guide_toc.cs

resolved conflicts for merge of 438fdfe8 to master

2009-09-03 09:41:39 -07:00

index.jd

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00