Brad Fitzpatrick 70588bf864 resolved conflicts for merge of 3a2c6bf0 to master ...

Change-Id: I1963d8fc391bb84de1054f2b20ce4e082d764cbe

2011-01-05 14:04:06 -08:00

..

appendix

Documentation fixes found over vacation hacking.

2011-01-05 13:07:34 -08:00

basics

…

developing

Merge "Doc change: deleting tips section that was merged into index.jd"

2011-01-04 12:05:40 -08:00

practices

cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55ee

2010-12-15 11:47:38 -08:00

publishing

cherrypick Change-Id: I52bc4e2d34015e6e30887590f920b580a034180e

2010-12-14 17:34:00 -08:00

samples

…

topics

am cdd76cf5: am 0d1e38ef: cherrypick Change-Id: I58e21f636e15d4b1522b66b16ffd48f1eb31308c docs: misc fixes to the drawable reference

2010-12-20 11:33:04 -08:00

tutorials

…

webapps

cherrypick Change-Id: I7033e605213db4b5c73c09c2207bed68a704aa72

2010-12-14 17:25:06 -08:00

guide_toc.cs

Doc change: removing debugging tips from nav

2011-01-04 11:54:50 -08:00

index.jd

…