Scott Main 952e39578d Merge commit '2f7b69aa' into manualmerge ...

Conflicts:
	docs/html/guide/topics/ui/themes.jd

2010-02-03 16:37:03 -08:00

..

community

…

guide

Merge commit '2f7b69aa' into manualmerge

2010-02-03 16:37:03 -08:00

images

…

intl/ja

…

mwc2010

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

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

reference

…

resources

am b299f802: am 9f4cfc3a: Merge "Screenshots for sample syncadapter." into eclair

2010-02-03 12:34:53 -08:00

sdk

am b574cf87: am 7b00a8ae: Merge "SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features." into eclair

2010-01-28 16:52:43 -08:00

shareables

docs: a lot of revision and expansion of the hello view tutorials

2010-01-19 19:46:02 -08:00

videos

…

app.yaml

…

favicon.ico

…

googleb38c1d60b7ba5d19.html

…

index.jd

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

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

license.jd

…

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

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

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