Nick Pelly 038cabe024 NFC integration ...

Source: Trusted_NFC_Device_Host_AA03.01e02_google.zip code drop (23-Sep-2010)

Conflicts:

	core/java/android/app/ApplicationContext.java
	core/java/android/provider/Settings.java
	core/jni/Android.mk
	core/jni/AndroidRuntime.cpp
	core/res/AndroidManifest.xml
	include/utils/Asset.h

Change-Id: I62c92f4c79f5ee65126c97602f6bc1c15794e573
Signed-off-by: Nick Pelly <npelly@google.com>

2010-09-28 22:36:27 -07:00

..

AlarmClock.java

Add new Alarm provider class for setting an alarm.

2010-09-24 13:52:14 -04:00

Applications.java

Support for apps search in apps provider contract

2010-03-31 14:32:09 +01:00

BaseColumns.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

Browser.java

Add a bulk request method for bookmark icons.

2010-04-12 14:26:13 -04:00

Calendar.java

Adds time zone functionality into fw as a hidden api

2010-09-14 11:16:08 -07:00

CallLog.java

New method to return the last dialed number

2010-01-15 10:41:56 -08:00

Contacts.java

Remove the IM provider contract class.

2009-12-17 13:47:36 -06:00

ContactsContract.java

DO NOT MERGE - redo Ib5e519fb40d3191ecac06c03a844872df19f3963

2010-09-22 11:52:53 -07:00

Downloads.java

Support for download manager "queue for wifi" dialogs

2010-09-21 12:48:09 -07:00

DrmStore.java

Support INSTALL_DRM permission

2009-07-24 16:57:02 -07:00

LiveFolders.java

Fix documentation.

2009-09-30 13:29:10 -07:00

MediaStore.java

Add MediaStore.ACTION_MEDIA_PLAY_FROM_SEARCH intent for open-ended

2010-09-08 20:39:05 -04:00

OpenableColumns.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

package.html

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

SearchRecentSuggestions.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

Settings.java

NFC integration

2010-09-28 22:36:27 -07:00

SocialContract.java

Fix missed Aggregate->Contact name change.

2009-07-30 11:46:13 -07:00

SyncConstValue.java

deprecate SyncConstValue, since it is now only used by the deprecated ContactsProvider interface

2010-02-25 16:52:05 -08:00

SyncStateContract.java

add a transaction monitor

2009-09-08 17:25:09 -07:00

Telephony.java

Add a new meta_data column

2010-03-11 13:37:17 -08:00

UserDictionary.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00