Scott Main 024127c11f resolved conflicts for merge of f0b3fa60 to master ...

Change-Id: Id15a8976a60548d50671d1c7af641302fce2f3d5

2010-10-25 17:54:33 -07:00

..

community

…

guide

am 96bdc500: am 5016df1c: Merge "Doc Change: Revert NotePad sample test package" into gingerbread

2010-10-25 16:27:15 -07:00

images

Revert "docs: new web apps dev guides" Do not merge.

2010-10-11 14:27:30 -07:00

intl/ja

…

mwc2010

…

reference

…

resources

resolved conflicts for merge of f0b3fa60 to master

2010-10-25 17:54:33 -07:00

sdk

am c9ac1079: update featured videos also remove "new" tags from SDK and Resources nav items

2010-10-25 17:15:50 -07:00

shareables

…

videos

update featured videos

2010-10-25 15:42:03 -07:00

app.yaml

…

favicon.ico

…

googleb38c1d60b7ba5d19.html

…

index.jd

docs: update homepage with more countries for market announcement

2010-10-04 15:45:11 -07:00

license.jd

…

offline.jd

…

robots.txt

…

search.jd

…

security_at_android_dot_com.txt

…

sitemap-intl.txt

…

sitemap.txt

add some pages to the sitemap file in an attempt to kick-start the build server so i can get a doc build

2010-10-08 17:06:29 -07:00