Trevor Johns a5060ee80d Merge branch 'mnc-mr-docs' into mnc-ub-dev ...

Large merge to reconnect automerger for docs branch to mainline.

 Conflicts:
	docs/html-intl/intl/es/index.jd
	docs/html-intl/intl/es/preview/download.jd
	docs/html-intl/intl/es/preview/index.jd
	docs/html-intl/intl/ja/index.jd
	docs/html-intl/intl/ja/preview/download.jd
	docs/html-intl/intl/ja/preview/index.jd
	docs/html-intl/intl/ko/index.jd
	docs/html-intl/intl/ko/preview/download.jd
	docs/html-intl/intl/ko/preview/index.jd
	docs/html-intl/intl/pt-br/index.jd
	docs/html-intl/intl/pt-br/preview/download.jd
	docs/html-intl/intl/pt-br/preview/index.jd
	docs/html-intl/intl/ru/index.jd
	docs/html-intl/intl/ru/preview/download.jd
	docs/html-intl/intl/ru/preview/index.jd
	docs/html-intl/intl/zh-cn/index.jd
	docs/html-intl/intl/zh-cn/preview/download.jd
	docs/html-intl/intl/zh-cn/preview/index.jd
	docs/html-intl/intl/zh-tw/index.jd
	docs/html-intl/intl/zh-tw/preview/download.jd
	docs/html-intl/intl/zh-tw/preview/index.jd
	docs/html/guide/topics/manifest/compatible-screens-element.jd
	docs/html/guide/topics/manifest/uses-feature-element.jd
	docs/html/preview/download.jd
	docs/html/preview/features/runtime-permissions.jd
	docs/html/sdk/index.jd
	docs/html/tools/revisions/studio.jd
	docs/html/tools/sdk/eclipse-adt.jd
	docs/html/tools/support-library/features.jd
	telephony/java/android/telephony/TelephonyManager.java

Bug: 28000173
Change-Id: Iacab0481175f1b32e0ac3bab98cde9e994100e94

2016-04-05 20:32:07 -07:00

..

about

docs: April 2016 Dashboard update

2016-04-04 08:49:28 -07:00

auto

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

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

channels

…

community

…

design

Change colons to equals for custom_link_attributes.

2016-03-24 14:57:24 -07:00

develop

update preview overview and update images.

2016-03-04 18:01:26 -08:00

distribute

Merge "docs: Removed "Drive Installs from Search" page." into mnc-mr-docs

2016-03-31 15:10:28 +00:00

google

Change colons to equals for custom_link_attributes.

2016-03-24 14:57:24 -07:00

guide

Merge branch 'mnc-mr-docs' into mnc-ub-dev

2016-04-05 20:32:07 -07:00

images

Update studio landing page and add all-new install flow docs.

2016-04-04 15:59:13 -07:00

ndk

Update studio landing page and add all-new install flow docs.

2016-04-04 15:59:13 -07:00

preview

Merge "Add missing </pin-set>" into mnc-mr-docs

2016-04-04 16:44:40 +00:00

reference

cherrypick from mnc-docs docs: Updated API changes for Dinar wearable support.

2016-03-29 13:32:35 -07:00

resources

…

samples

docs: Add _book.yaml files for DevSite navigation

2016-03-17 17:23:21 -07:00

sdk

Update studio landing page and add all-new install flow docs.

2016-04-04 15:59:13 -07:00

shareables

…

tools

Merge branch 'mnc-mr-docs' into mnc-ub-dev

2016-04-05 20:32:07 -07:00

training

docs: "Result is:" paragraph now in correct position on page.

2016-03-31 09:28:04 -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: Add _book.yaml files for DevSite navigation

2016-03-17 17:23:21 -07:00

_redirects.yaml

docs: Removed "Drive Installs from Search" page.

2016-03-23 20:25:02 -07:00

app.yaml

…

favicon-a.ico

…

favicon.ico

…

gcm_navtree_data.js

…

gms_navtree_data.js

…

googlef295f8c7d59b0d29.html

…

index.jd

Revert "Updates for Play" April Fool's joke.

2016-04-01 18:16:26 +00:00

jd_collections.js

Update studio landing page and add all-new install flow docs.

2016-04-04 15:59:13 -07:00

jd_extras_en.js

docs: Removed "Drive Installs from Search" page.

2016-03-23 20:25:02 -07: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

Update studio landing page and add all-new install flow docs.

2016-04-04 15:59:13 -07:00

jd_tag_helpers.js

Updates for preview...

2016-03-09 00:34:07 -08:00

legal.jd

docs: Eclipse ADT removing and replacing mentions

2016-01-14 09:48:30 -08:00

license.jd

…

offline.jd

…

resources.jd

…

robots.txt

…

security_at_android_dot_com.txt

…

sitemap-intl.txt

…

sitemap.txt

…

support.jd

Doc change: adjustments for design updates.

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