Scott Main d9ec8eba56 resolved conflicts for merge of 7008b7c1 to master ...

Change-Id: I360136e54229cae1fc0fa15eab8f1490b8a0fb5e

2010-10-04 18:42:49 -07:00

..

community

update 404'd source.android.com URLs

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

guide

resolved conflicts for merge of 7008b7c1 to master

2010-10-04 18:42:49 -07:00

images

am 44fad94a: am 30f57295: am ba944ccd: Doc change: update screens support table and remove outdated density/size metrics.

2010-10-04 11:20:36 -07: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

…

resources

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

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

sdk

Doc change: ADT 0.9.9 version notes, size/sum update.

2010-09-23 11:48:54 -07:00

shareables

Doc change: remove pdf summary of guidelines from templates archive.

2010-06-11 15:59:47 -07:00

videos

…

app.yaml

…

favicon.ico

…

googleb38c1d60b7ba5d19.html

…

index.jd

Doc change: Add nexus one to dev phones.

2010-07-23 13:26:24 -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

…

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

…

sitemap-intl.txt

…

sitemap.txt

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

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