Dianne Hackborn a7f88508d3 resolved conflicts for merge of 872a1e79 to master ...

Change-Id: I50253b22f181729d4e748970acf1a3ad868ccd74

2011-06-16 16:01:27 -07:00

..

community

docs: add redirects to key legacy docs

2011-05-16 13:54:02 -07:00

guide

am 8a8f82bb: am 4963cd0b: am 1a3e7cf2: Merge "cherry pick from hc mr1 Change-Id: I6f48d245e2837226096fe42d08fb0243e416dbbc" into honeycomb-mr2

2011-06-14 20:57:07 -07:00

images

Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d

2011-05-17 17:21:00 -07:00

intl/ja

…

mwc2010

…

reference

…

resources

resolved conflicts for merge of 872a1e79 to master

2011-06-16 16:01:27 -07:00

sdk

Merge "cherrypick from hc mr1 Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d74bf7d" into honeycomb-mr2

2011-06-14 17:45:04 -07:00

shareables

…

videos

docs: update featured videos and increase the max results for each playlist

2011-05-16 10:56:26 -07:00

app.yaml

…

favicon.ico

…

googlef295f8c7d59b0d29.html

…

index.jd

docs: update homepage I/O announcement

2011-05-13 11:27:53 -07:00

license.jd

…

offline.jd

…

robots.txt

…

search.jd

…

security_at_android_dot_com.txt

…

sitemap-intl.txt

…

sitemap.txt

…