diff options
| author | Nick Pelly <npelly@google.com> | 2010-09-29 12:20:51 -0700 |
|---|---|---|
| committer | Nick Pelly <npelly@google.com> | 2010-09-29 12:20:51 -0700 |
| commit | 4715bd91f5949a1919156a5a5cb50f0cccda645e (patch) | |
| tree | 75e45e380c7208467ac6d29ba79a0ff3806c4f76 /Android.mk | |
| parent | 856f2859e8550c274c7fe3f05b971bf34bdcb525 (diff) | |
| parent | f4c3b7e916b417fabb468ec0a565dc79cd7ba2b3 (diff) | |
| download | frameworks_base-4715bd91f5949a1919156a5a5cb50f0cccda645e.zip frameworks_base-4715bd91f5949a1919156a5a5cb50f0cccda645e.tar.gz frameworks_base-4715bd91f5949a1919156a5a5cb50f0cccda645e.tar.bz2 | |
resolved conflicts for merge of f4c3b7e9 to master
Change-Id: Idcdc521144f3072058b2bb6cb383e42c852e64f4
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -161,6 +161,14 @@ LOCAL_SRC_FILES += \ core/java/com/android/internal/view/IInputMethodManager.aidl \ core/java/com/android/internal/view/IInputMethodSession.aidl \ core/java/com/android/internal/widget/IRemoteViewsFactory.aidl \ + core/java/com/trustedlogic/trustednfc/android/ILlcpConnectionlessSocket.aidl \ + core/java/com/trustedlogic/trustednfc/android/ILlcpServiceSocket.aidl \ + core/java/com/trustedlogic/trustednfc/android/ILlcpSocket.aidl \ + core/java/com/trustedlogic/trustednfc/android/INdefTag.aidl \ + core/java/com/trustedlogic/trustednfc/android/INfcManager.aidl \ + core/java/com/trustedlogic/trustednfc/android/INfcTag.aidl \ + core/java/com/trustedlogic/trustednfc/android/IP2pInitiator.aidl \ + core/java/com/trustedlogic/trustednfc/android/IP2pTarget.aidl \ location/java/android/location/ICountryDetector.aidl \ location/java/android/location/ICountryListener.aidl \ location/java/android/location/IGeocodeProvider.aidl \ |