Andrew Solovay 238ea71c51 resolve merge conflicts of 07fe016 to nyc-dev ...

am: 0f9a790e0f

Change-Id: Ib2c80caff9cd1cde788ed00bf64afff8862d981b

2016-07-28 00:04:43 +00:00

..

about

Fix code tags that contain html encoded characters, and fix at links.

2016-07-22 18:29:36 -07:00

auto

docs: Added two new logos to Auto index page.

2016-07-19 13:32:30 -07:00

design

Adding projec.yaml files to all top/sub categories.

2016-07-19 16:49:01 -04:00

develop

Adding projec.yaml files to all top/sub categories.

2016-07-19 16:49:01 -04:00

distribute

Adding projec.yaml files to all top/sub categories.

2016-07-19 16:49:01 -04:00

google

Fix code tags that contain html encoded characters, and fix at links.

2016-07-22 18:29:36 -07:00

guide

docs: Moving multi-window docs out of N Preview area for N release

2016-07-27 23:29:23 +00:00

images

resolve merge conflicts of 07fe016 to nyc-dev

2016-07-27 16:26:19 -07:00

preview

docs: Removing N Preview AfW doc, and setting up redirect

2016-07-27 23:15:06 +00:00

reference

Adding projec.yaml files to all top/sub categories.

2016-07-19 16:49:01 -04:00

resources

…

samples

Adding projec.yaml files to all top/sub categories.

2016-07-19 16:49:01 -04:00

sdk

docs: remove trailing white space from jd files

2016-07-18 10:42:11 -07:00

shareables

…

topic

resolve merge conflicts of 07fe016 to nyc-dev

2016-07-27 16:26:19 -07:00

training

docs: Moving multi-window docs out of N Preview area for N release

2016-07-27 15:55:47 -07:00

tv

…

wear

Adding projec.yaml files to all top/sub categories.

2016-07-19 16:49:01 -04:00

work

Fix code tags that contain html encoded characters, and fix at links.

2016-07-22 18:29:36 -07:00

_project.yaml

Adding projec.yaml files to all top/sub categories.

2016-07-19 16:49:01 -04:00

_redirects.yaml

docs: Removing N Preview AfW doc, and setting up redirect

2016-07-27 23:15:06 +00:00

app.yaml

…

favicon-a.ico

…

favicon.ico

…

gcm_navtree_data.js

…

gms_navtree_data.js

…

googlef295f8c7d59b0d29.html

…

index.jd

docs: Updates for DP4 release

2016-06-14 21:02:45 -07:00

jd_collections.js

Merge "docs: Edited "Promote with Ads" page; created "Nearby" feature page." into mnc-io-docs

2016-07-07 18:09:42 +00:00

jd_extras_en.js

Merge "docs: Updated images and content on "Google Sign-In" page." into nyc-dev

2016-07-19 17:41:52 +00:00

jd_extras_es.js

…

jd_extras_ja.js

…

jd_extras_ko.js

…

jd_extras_ru.js

…

jd_extras_zh-cn.js

…

jd_extras_zh-tw.js

…

jd_extras.js

Merge "docs: Edited "Promote with Ads" page; created "Nearby" feature page." into mnc-io-docs

2016-07-07 18:09:42 +00:00

jd_tag_helpers.js

docs: work minisite

2016-05-16 13:36:55 -07:00

legal.jd

Update links for all files under sdk/ that moved to studio/

2016-05-15 02:55:23 +00:00

license.jd

docs: remove trailing white space from jd files

2016-07-18 10:42:11 -07:00

offline.jd

Update links for all files under sdk/ that moved to studio/

2016-05-15 02:55:23 +00:00

resources.jd

…

robots.txt

…

security_at_android_dot_com.txt

…

sitemap-intl.txt

…

support.jd

…