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

..

assets

http://b/issue?id=2516676

2010-03-25 14:19:06 +00:00

res

NFC integration

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

Android.mk

Do not use a user tag on apps, as it is ignored.

2010-01-06 08:53:44 -08:00

AndroidManifest.xml

NFC integration

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

MODULE_LICENSE_APACHE2

…

NOTICE

…