Robert Ly 4e552533ea resolved conflicts for merge of b078d942 to ics-mr1 ...

Change-Id: I831c06f2c198cc8825788a05770397457e8d511c

2012-01-19 13:25:07 -08:00

..

community

docs: add redirects to key legacy docs

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

design

docs: Android design CSS/JS fixes

2012-01-12 13:57:44 -08:00

guide

resolved conflicts for merge of b078d942 to ics-mr1

2012-01-19 13:25:07 -08:00

images

resolved conflicts for merge of b078d942 to ics-mr1

2012-01-19 13:25:07 -08:00

intl/ja

Update dev guide for new build system and new lib system.

2011-10-06 00:39:44 -07:00

mwc2010

…

reference

docs: adding rs api docs

2012-01-17 16:14:44 -08:00

resources

docs: dasboard update for 1/3/12

2012-01-03 15:45:00 -08:00

sdk

docs: Android API 15 SDK r2 Release Notes

2012-01-17 12:53:58 -08:00

shareables

docs: Android University - Camera class

2011-12-15 16:01:59 -08:00

training

docs: fix broken links in .jd docs

2012-01-03 15:12:51 -08:00

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: make AD logo clickable on home page

2012-01-12 15:33:38 -08:00

license.jd

…

offline.jd

docs: preliminary homepage announcement (offline version)

2011-10-14 03:58:31 -07:00

robots.txt

…

search.jd

docs: fix a bug in the search results in which clicking a sorting tab

2011-10-03 15:42:21 -07:00

security_at_android_dot_com.txt

…

sitemap-intl.txt

…

sitemap.txt

cherrypick Change-Id: Icf0c7772901f742c36ba417e07cc5e299f72849a

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