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

..

adk

docs: Android Eclipse ADT update and removals - Batch 03

2015-12-17 14:48:55 -08:00

building

Docs: Simplified the Running and Building in Android Studio doc

2016-03-23 10:09:56 -07:00

data-binding

Remove beta notification for data binding and add a few docs.

2016-01-28 15:42:52 -08:00

debugging

docs: Corrected typo in logcat example

2016-03-22 00:16:00 +00:00

devices

docs: emulator updates

2015-04-29 13:29:15 -07:00

extras

docs: Added Blackberry drivers to list of OEM USB Drivers. Updated dead

2015-12-14 18:23:19 -08:00

help

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

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

performance

Docs: Added three missing steps in memory monitor.

2016-02-29 22:23:44 -08:00

projects

docs: Fixed extra slash in pathname

2016-02-17 13:14:53 -08:00

publishing

Docs: Simplified the Running and Building in Android Studio doc

2016-03-23 10:09:56 -07:00

revisions

Changelog for BuildTools 23.0.3

2016-03-21 16:07:36 -07:00

sdk

update all hardcoded zippy images to use new Material icon (down-facing instead of right-facing)

2016-03-16 12:13:05 -07:00

studio

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

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

support-library

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

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

testing

docs: Refactor testing docs to remove/update obsolete guidance:

2016-01-14 05:02:18 -08:00

testing-support-library

docs: Refactor testing docs to remove/update obsolete guidance:

2016-01-14 05:02:18 -08:00

workflow

docs: studio workflow page typo

2015-06-30 12:27:11 -07:00

_book.yaml

Change colons to equals for custom_link_attributes.

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

device.jd

…

tools_toc.cs

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

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

workflow.jd

docs: Android Eclipse ADT update and removals - Batch 03

2015-12-17 14:48:55 -08:00