Andrew Solovay bd96855929 resolve merge conflicts of 33d83db to mnc-ub-dev ...

Change-Id: I8c148af6eec071ac076882a53c5ba2929cf0c9d2

2016-05-17 16:09:03 -07:00

..

about

invert the quotes for links in the JSON to avoid breakage from devsite's URL parser (or whatever).

2016-05-16 18:22:06 -07:00

auto

docs: Added new partner logos to the car brands section of auto index

2016-04-01 13:05:42 -07:00

community

…

design

Change custom_link_attributes to path_attributes format.

2016-04-27 20:07:57 -07:00

develop

Merge "Update default image for n preview docs. Update tools resources." into mnc-mr-docs

2016-05-16 22:27:48 +00:00

distribute

docs: work minisite

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

google

Merge "cherrypick from mnc-io-docs docs: Updated Billing API documentation (for Project Nickel)." into mnc-io-docs

2016-05-17 18:21:31 +00:00

guide

Merge "docs: work minisite" into mnc-io-docs

2016-05-16 22:12:37 +00:00

images

Merge "cherrypick from mnc-io-docs docs: Updated Billing API documentation (for Project Nickel)." into mnc-io-docs

2016-05-17 18:21:31 +00:00

ndk

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

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

preview

Merge "Docs: CL for continuing work on tactically merged N-DP3 docs." into mnc-io-docs

2016-05-17 03:17:41 +00:00

reference

Merge "fix typo in book path for devsite builds." into mnc-mr-docs

2016-05-15 19:38:52 +00:00

resources

…

samples

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

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

sdk

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

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

shareables

…

topic/libraries

docs: Creating new support library revision history page

2016-05-17 13:51:43 -07:00

training

docs: work minisite

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

tv

Update for DevSite build. Added nonavpage variable to pages expecting no nav.

2016-02-23 13:51:13 -05:00

wear

docs: Wear preview - update to leftnav

2016-05-17 10:58:06 -07:00

work

docs: work minisite

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

_redirects.yaml

docs: work minisite

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

app.yaml

…

favicon-a.ico

…

favicon.ico

…

gcm_navtree_data.js

…

gms_navtree_data.js

…

googlef295f8c7d59b0d29.html

…

index.jd

Update default image for n preview docs. Update tools resources.

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

jd_collections.js

docs: work minisite

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

jd_extras_en.js

Merge "Update default image for n preview docs. Update tools resources." into mnc-mr-docs

2016-05-16 22:31:30 +00:00

jd_extras_es.js

Doc change: adjustments for design updates.

2016-01-28 17:10:09 -08:00

jd_extras_ja.js

Change protocol in lang-specific resources to https to match others. https -> http for several carousel items until metadata transitions to https.

2016-01-30 17:56:20 -08:00

jd_extras_ko.js

Change protocol in lang-specific resources to https to match others. https -> http for several carousel items until metadata transitions to https.

2016-01-30 17:56:20 -08:00

jd_extras_ru.js

Doc change: adjustments for design updates.

2016-01-28 17:10:09 -08:00

jd_extras_zh-cn.js

Change protocol in lang-specific resources to https to match others. https -> http for several carousel items until metadata transitions to https.

2016-01-30 17:56:20 -08:00

jd_extras_zh-tw.js

Doc change: adjustments for design updates.

2016-01-28 17:10:09 -08:00

jd_extras.js

docs: work minisite

2016-05-16 13:36:55 -07: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

…

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

Doc change: adjustments for design updates.

2016-01-28 17:10:09 -08:00