Robert Ly 4e552533ea resolved conflicts for merge of b078d942 to ics-mr1 ...

Change-Id: I831c06f2c198cc8825788a05770397457e8d511c

2012-01-19 13:25:07 -08:00

..

appendix

docs: mention x86 as a native platform filter

2012-01-13 18:20:10 -08:00

basics

…

developing

Merge "docs: fix broken links in .jd docs" into ics-mr1

2012-01-10 12:53:42 -08:00

market

Cherrypick from HCMR2 Change ID: Id849cb25098fef76c96c4935db31ebc1422d74d8

2011-12-01 11:46:59 -08:00

practices

Merge "Update notification documentation to follow current guidelines." into ics-mr1

2012-01-13 16:36:05 -08:00

publishing

docs: fix broken links in .jd docs

2012-01-03 15:12:51 -08:00

samples

docs: add redirects to key legacy docs

2011-05-16 13:54:02 -07:00

topics

resolved conflicts for merge of b078d942 to ics-mr1

2012-01-19 13:25:07 -08:00

tutorials

docs: remove gerunds from UI dev guides and resolve linkbacks

2011-09-14 11:30:05 -07:00

webapps

docs: fix snippet errors in web doc

2011-04-15 17:55:33 -07:00

guide_toc.cs

resolved conflicts for merge of b078d942 to ics-mr1

2012-01-19 13:25:07 -08:00

index.jd

cherrypick Change-Id: Icf0c7772901f742c36ba417e07cc5e299f72849a

2011-02-08 09:24:03 -08:00