Dirk Dougherty 5e72709d38 resolved conflicts for merge of f11d7d55 to master

2009-08-06 01:14:04 -07:00

..

appendix

am af09b67f: add api level doc to the appendix

2009-07-31 14:22:02 -07:00

basics

auto import from //depot/cupcake/@135843

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

developing

am be9d08d0: Merge change 20228 into donut

2009-08-05 22:08:14 -07:00

practices

AI 150289: Added Menu Design guidelines. View the pages at:

2009-07-02 03:21:25 -07:00

publishing

AI 147874: Fix format and link errors in docs.

2009-04-27 18:13:11 -07:00

samples

AI 148193: More misc fixes in format, links, content for Android 1.5 SDK docs.

2009-05-01 13:01:24 -07:00

topics

am 11b6a29d: Merge change 8564 into donut

2009-07-26 21:47:27 -07:00

tutorials

Add support for preview SDK handling in doc templates. Add preview SDK docs.

2009-08-06 00:14:25 -07:00

guide_toc.cs

AI 150369: Add localized TOCs for developer site.

2009-07-07 17:37:13 -07:00

index.jd

auto import from //depot/cupcake/@135843

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