Robert Ly 65bdc59ea0 resolved conflicts for merge of 810c1c0c to honeycomb-plus-aosp ...

Conflicts:
	docs/html/guide/guide_toc.cs

Change-Id: I42d55f7ae899a914dc3f1c8a55492411c28057a2

2011-02-11 13:49:09 -08:00

..

community

update 404'd source.android.com URLs

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

guide

resolved conflicts for merge of 810c1c0c to honeycomb-plus-aosp

2011-02-11 13:49:09 -08:00

images

Merge "Doc change: updating animation framework topic" into honeycomb

2011-02-11 13:15:55 -08:00

intl/ja

update 404'd source.android.com URLs

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

mwc2010

…

reference

…

resources

cherrypick Change-Id: I6053e6f20045b0ecba4b964f9bfb87c3241d3a91

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

sdk

Doc change: changes for 3.0 SDK

2011-02-10 12:01:21 -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

add 2.3.3 announcement to site home page

2011-02-09 10:17:08 -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