Scott Main e139f4df16 resolved conflicts for merge of 96f57d6c to master ...

Change-Id: I8ed2ca9143facaec56628d51ae51d9f95da91613

2011-01-07 17:53:59 -08:00

..

community

update 404'd source.android.com URLs

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

guide

resolved conflicts for merge of 96f57d6c to master

2011-01-07 17:53:59 -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

…

reference

…

resources

resolved conflicts for merge of 96f57d6c to master

2011-01-07 17:53:59 -08:00

sdk

resolved conflicts for merge of 96f57d6c to master

2011-01-07 17:53:59 -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

…

favicon.ico

…

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

…

robots.txt

…

search.jd

…

security_at_android_dot_com.txt

…

sitemap-intl.txt

…

sitemap.txt

cherrypick Change-Id: I7033e605213db4b5c73c09c2207bed68a704aa72

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