Scott Main b5d35088cb resolved conflicts for merge of b842629c to honeycomb-plus-aosp ...

Change-Id: I5628f9e3baad68882b63a2917df3fb0bb1bbdfa6

2011-02-18 19:42:29 -08:00

..

community

update 404'd source.android.com URLs

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

guide

am e4da3934: Merge "docs: move new AIDL doc back into the existing doc, but move the side nav location out of tools" into honeycomb

2011-02-18 15:11:14 -08:00

images

Merge "SDK docs: Hierarchy Viewer V2" into honeycomb

2011-02-15 12:32:48 -08:00

intl/ja

update 404'd source.android.com URLs

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

mwc2010

…

reference

…

resources

Doc change: fixing renderscript samples

2011-02-17 18:44:31 -08:00

sdk

docs: update sizes and sums for tools and ndk

2011-02-18 17:02:10 -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 3.0 announcement

2011-02-14 11:19:05 -08: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

docs: revise offline homepage; delete developing index redirect page

2011-01-17 14:48:15 -08:00

robots.txt

…

search.jd

…

security_at_android_dot_com.txt

…

sitemap-intl.txt

…

sitemap.txt

cherrypick Change-Id: Icf0c7772901f742c36ba417e07cc5e299f72849a

2011-02-08 09:24:03 -08:00