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

..

accessibilityservice

…

accounts

Add get_accounts app op

2015-09-08 17:54:37 -07:00

animation

…

annotation

…

app

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

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

appwidget

docs: Fix typo behavrio -> behavior

2016-02-04 17:31:37 -08:00

bluetooth

Add Bluetooth headset API to allow disabling audio route.

2015-11-16 08:55:52 -08:00

content

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

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

database

…

ddm

…

debug

…

emoji

…

gesture

…

hardware

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

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

inputmethodservice

Fix: Wrong suggestion popup position in extract mode.

2015-07-17 16:36:57 -07:00

net

Reinstate CHANGE_NETWORK_STATE as a normal permission.

2015-12-16 15:33:15 +09:00

nfc

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

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

os

Merge "Revert "Revert "Track ashmem memory usage in Parcel""" into mnc-dr-dev

2015-10-23 17:29:13 +00:00

preference

Update volume slider on device changed.

2015-10-14 16:13:28 -04:00

print

…

printservice

…

provider

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

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

security

Add KM_MIN_MAC_LENGTH tag to HMAC and AES-GCM keys.

2015-07-16 16:52:51 -07:00

service

Add 'until next alarm' option to QS zen panel.

2015-10-15 17:02:00 -04:00

speech

NPE occured when trying to parcel voice features.

2015-08-05 15:48:26 +01:00

test

…

text

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

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

transition

Set the bounds on the drawable for ChangeBounds reparenting.

2015-10-19 23:42:38 +00:00

util

Fix issue #23122445: Add 420 density

2015-08-11 17:18:53 -07:00

view

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

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

webkit

Close ZipFiles correctly in WebViewFactory.

2015-08-10 16:40:50 +01:00

widget

Fix crash on calling removeSelection with showing selection handlers

2015-10-22 07:39:17 +00:00

package.html

…