Scott Main c06e7abe6f resolved conflicts for merge of 42f18194 to honeycomb-plus-aosp ...

Change-Id: I42c36e828f5b28d84f2062bfd4963711251696b7

2011-02-10 13:47:32 -08:00

..

community

…

guide

resolved conflicts for merge of 42f18194 to honeycomb-plus-aosp

2011-02-10 13:47:32 -08:00

images

cherrypick Change-Id: Ica1b68a1687917432d39d7d116c9c24fa1644a83

2011-02-08 09:18:42 -08:00

intl/ja

…

mwc2010

…

reference

…

resources

cherrypick Change-Id: I6053e6f20045b0ecba4b964f9bfb87c3241d3a91

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

sdk

Merge "Doc change: add diff report for API 11" into honeycomb

2011-02-09 15:19:08 -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

cherrypick Change-Id: Ia4a3488a7f25925b512c0e0ae64c1f5dcf30f680

2011-02-08 09:15:48 -08:00

license.jd

…

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