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

Change-Id: I360136e54229cae1fc0fa15eab8f1490b8a0fb5e

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

..

community

…

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

…

mwc2010

…

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

…

videos

…

app.yaml

…

favicon.ico

…

googleb38c1d60b7ba5d19.html

…

index.jd

…

license.jd

…

offline.jd

…

robots.txt

…

search.jd

…

security_at_android_dot_com.txt

…

sitemap-intl.txt

…

sitemap.txt

…