| commit | 038cabe0247ee46df62f9363f1a303bc5b9c1028 | [log] [tgz] |
|---|---|---|
| author | Nick Pelly <npelly@google.com> | Thu Sep 23 16:12:11 2010 -0700 |
| committer | Nick Pelly <npelly@google.com> | Tue Sep 28 22:36:27 2010 -0700 |
| tree | 11c6037442f85e0e7adad870ba9d8092323b6bf0 | |
| parent | d6877fa4971710150de20453bf4ba54dca863429 [diff] |
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>