Kevin Hufnagle 397ae7a2e6 resolve merge conflicts of 7f7eec3 to nyc-dev ...

Change-Id: I35b5b7103b89e0e12e21e809a3d3952738c9a668

2016-05-26 14:57:15 -07:00

..

about

Merge "fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug: 28801246" into mnc-mr-docs am: 486f792d44 am: 9ad92619dc

2016-05-20 00:14:02 +00:00

auto

…

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

Merge "docs: work minisite" into mnc-io-docs am: 8f740bea13

2016-05-16 22:19:41 +00:00

google

Merge "docs: Remove Advertising ID page and redirect to GMS reference docs" into mnc-io-docs am: 9e823c7048

2016-05-26 04:47:34 +00:00

guide

resolve merge conflicts of 7f7eec3 to nyc-dev

2016-05-26 14:57:15 -07:00

images

Doc: delete old test_framework.png

2016-05-24 10:58:43 -07:00

ndk

Update links for all files under sdk/ that moved to studio/ am: 89d11705a1 am: d10e0132a1

2016-05-15 03:11:46 +00:00

preview

Merge "Merge "Track changes to network security config manifest configuration" into mnc-mr-docs am: c0f99aebdc" into mnc-io-docs am: ce99e3c571

2016-05-26 04:47:44 +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

Merge "docs: Instant Apps broken link, wonky video thumbnail" into mnc-io-docs am: 5548a7c59c

2016-05-25 21:50:00 +00:00

training

Merge "docs: Removing CLI steps in getting started docs" into mnc-io-docs am: 8e08dbe8f8

2016-05-26 19:35:13 +00:00

tv

…

wear

docs: Update to column widths for Complications table

2016-05-19 15:01:38 -07:00

work

docs: work - Update devhub url

2016-05-17 16:19:44 -07:00

_redirects.yaml

add redirect for Espresso Test Recorder doc that will soon be on TAC site.

2016-05-26 10:33:07 -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

Merge "docs: Restored references to "Know Your User" resource cards." into mnc-docs am: dbfd7dd16a

2016-05-19 16:57:10 +00:00

jd_extras_en.js

Docs: Changed URL references of relocated test_framework.png

2016-05-24 09:42:41 -07: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: Restored references to "Know Your User" resource cards." into mnc-docs am: dbfd7dd16a

2016-05-19 16:57:10 +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: Update content license page to include Javadocs licenses

2016-05-19 13:33:24 +01: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

…