Robert Ly d3f802c02f resolved conflicts for merge of c0b3ba83 to master ...

Change-Id: I9358b1b6f200cb41740bc4243f9ab65b3e76bd99

2011-02-02 16:08:23 -08:00

..

community

…

guide

resolved conflicts for merge of c0b3ba83 to master

2011-02-02 16:08:23 -08:00

images

cherrypick Change-Id: Ic268b65b127b356155dd62d737029ce442c12f51

2011-01-20 18:37:41 -08:00

intl/ja

…

mwc2010

…

reference

…

resources

Doc change: adding missing nfc demo png

2011-01-19 22:52:18 -08:00

sdk

Mass merge from gingerbread - do not merge

2011-01-30 12:40:38 -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

docs: update homepage for GB

2010-11-05 14:37:47 -07: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: I7033e605213db4b5c73c09c2207bed68a704aa72

2010-12-14 17:25:06 -08:00