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

Change-Id: I1963d8fc391bb84de1054f2b20ce4e082d764cbe

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

..

community

update 404'd source.android.com URLs

2010-06-25 17:32:20 -07:00

guide

resolved conflicts for merge of 3a2c6bf0 to master

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

images

Merge "Doc change: Debugging section of dev guide restructuring"

2010-12-29 14:59:48 -08:00

intl/ja

update 404'd source.android.com URLs

2010-06-25 17:32:20 -07:00

mwc2010

doc change only: Update announcement and mwc redirect to point to microsite.

2010-01-26 16:58:33 -08:00

reference

donut snapshot

2009-05-20 11:28:04 -07:00

resources

resolved conflicts for merge of 3a2c6bf0 to master

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

sdk

am e1df8e9b: am 00410256: cherrypick Change-Id: I51b73bb0bb09ef0b928efec151f55e0bf8ffc954 docs: fix typos

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

shareables

Update icon guidelines for Gingerbread. Also add new, revamped icon templates pack.

2010-12-13 18:04:41 -08:00

videos

update featured videos

2010-10-25 15:42:03 -07:00

app.yaml

auto import from //depot/cupcake/@135843

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

favicon.ico

auto import from //depot/cupcake/@135843

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

googlef295f8c7d59b0d29.html

cherrypick Change-Id: I7033e605213db4b5c73c09c2207bed68a704aa72

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

index.jd

docs: update homepage for GB

2010-11-05 14:37:47 -07:00

license.jd

docs: Remove the TOS from download flow and remove TOS entirely because

2010-06-24 17:29:13 -07:00

offline.jd

doc change: Add docs for SDK. Support new modular structure. In Android.mk, change @since level identifier to 5.xml, expose adt downloadable vars. Fix links that pointed to @sdkCurrent.

2009-10-22 00:59:47 -07:00

robots.txt

upload new dev site robots.txt to disallow old tutorial and

2009-12-21 11:32:22 -08:00

search.jd

docs: reference the history JS file with docRoot in order to

2010-01-25 14:47:46 -08:00

security_at_android_dot_com.txt

auto import from //depot/cupcake/@135843

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

sitemap-intl.txt

donut snapshot

2009-07-31 17:38:20 -07:00

sitemap.txt

cherrypick Change-Id: I7033e605213db4b5c73c09c2207bed68a704aa72

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