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

Change-Id: I1963d8fc391bb84de1054f2b20ce4e082d764cbe

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

..

articles

am 69ea4e15: Documentation fixes found over vacation hacking.

2011-01-05 13:52:53 -08:00

dashboard

docs: dashboard update

2010-12-01 12:48:39 -08:00

faq

Documentation fixes found over vacation hacking.

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

samples

Adding NFC sample resources (DO NOT MERGE)

2010-11-12 18:35:49 -08:00

tutorials

am 14e6325d: am 1bcfd85c: cherrypick Change-Id: I56db12e2444e5020cd72a0c974539e777a7f1ebd docs: fix syntax error; enlarge screenshot thumbnail

2010-12-14 17:09:29 -08:00

browser.jd

Revamp resources listing, part 1 (frameworks/base)

2010-06-04 12:29:48 -07:00

community-groups.jd

Doc change: update screens support table and remove outdated density/size metrics.

2010-10-04 09:48:48 -07:00

community-more.jd

cherry-pick af4786bcb5945f72e8639d74611cd5f9b0236710 to froyo

2010-03-26 17:32:26 -07:00

index.jd

Integrating webinar hosting with developer.android.com

2010-12-09 11:42:12 -08:00

resources_toc.cs

Integrating webinar hosting with developer.android.com

2010-12-09 11:42:12 -08:00

resources-data.js

docs: de-'new' samples and tutorials

2010-11-19 10:20:45 -08:00

topics.jd

Revamp resources listing, part 1 (frameworks/base)

2010-06-04 12:29:48 -07:00