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

..

cardemulation

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

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

tech

docs: Fixed text and Kovio links.

2016-01-29 12:37:51 -08:00

ApduList.aidl

…

ApduList.java

…

BeamShareData.aidl

…

BeamShareData.java

Add UserHandle to BeamShareData

2014-11-03 11:44:10 -08:00

ErrorCodes.java

…

FormatException.java

…

IAppCallback.aidl

Expose peer LLCP version in NDEF callbacks.

2015-04-15 12:33:37 +02:00

INfcAdapter.aidl

Verify NFC permission immediately on API calls.

2014-11-14 10:51:14 -08:00

INfcAdapterExtras.aidl

…

INfcCardEmulation.aidl

AID prefix registration.

2014-09-08 23:49:07 -07:00

INfcTag.aidl

…

INfcUnlockHandler.aidl

NFC Unlock api changes

2014-07-31 01:09:02 +00:00

NdefMessage.aidl

…

NdefMessage.java

…

NdefRecord.aidl

…

NdefRecord.java

Merge "Tabs -> spaces in frameworks/base."

2014-02-25 19:57:33 +00:00

NfcActivityManager.java

In NfcActivityManager, don't use UserHandle.CURRENT.

2015-07-01 12:27:09 +01:00

NfcAdapter.java

Add hidden API to disable NFC (optional persist).

2014-09-25 18:02:27 -07:00

NfcEvent.java

Make peer LLCP version an int.

2015-06-10 08:49:02 +02:00

NfcManager.java

…

package.html

…

Tag.aidl

…

Tag.java

NFC Unlock api changes

2014-07-31 01:09:02 +00:00

TagLostException.java

…

TechListParcel.aidl

…

TechListParcel.java

…

TransceiveResult.aidl

…

TransceiveResult.java

…