Eric Schmidt 31e070a1b3 Merge "docs: Instant Apps broken link, wonky video thumbnail" into mnc-io-docs am: 5548a7c59c ...

am: 3c2709c6b7

* commit '3c2709c6b7b40f0a31674a775f891ca4e198cfa5':
  docs: Instant Apps broken link, wonky video thumbnail

Change-Id: Ib072e701b8793baba0c9da9a24748dc89b1dae55

2016-05-25 21:50:00 +00: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

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -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

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

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

google

Merge "Docs: Fixed a wrong file name" into mnc-io-docs am: 06a9fbcdd6

2016-05-20 00:25:49 +00:00

guide

Merge "Revert "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31"" into lmp-docs am: 36785ff4bd am: b6f51341e8 am: f6987bc94c am: 8fc4c789f1 am: c387613d53 am: f7688a4f29

2016-05-19 18:45:25 +00: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 "Fix incorrect cleartext attribute" into mnc-mr-docs am: f2e0a719d0 am: 56f32483b0

2016-05-25 18:36:47 +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: work minisite" into mnc-io-docs am: 8f740bea13

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

tv

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

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

docs: Add redirect for Android Device Monitor and change redirects for Virtual Device Config and Run/Debug Config b/28826469 b/28705592

2016-05-18 15:11:54 +00: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

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

jd_extras_ja.js

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

jd_extras_ko.js

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

jd_extras_ru.js

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

jd_extras_zh-cn.js

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

jd_extras_zh-tw.js

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

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

…

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

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00