diff options
| author | Nick Pelly <npelly@google.com> | 2011-03-14 10:28:11 -0700 |
|---|---|---|
| committer | Nick Pelly <npelly@google.com> | 2011-03-14 10:28:11 -0700 |
| commit | a64e2ad4da3612586594a19489a2b5d44f3f23a0 (patch) | |
| tree | 1c682135210ff543b511152425bc0406b754780d /Android.mk | |
| parent | 2d24213fca55fece8ce4a69a53abcd45983b0443 (diff) | |
| parent | 38d0d5628d36bb1c2a8353a2b3e1a041e9e84652 (diff) | |
| download | frameworks_base-a64e2ad4da3612586594a19489a2b5d44f3f23a0.zip frameworks_base-a64e2ad4da3612586594a19489a2b5d44f3f23a0.tar.gz frameworks_base-a64e2ad4da3612586594a19489a2b5d44f3f23a0.tar.bz2 | |
resolved conflicts for merge of 38d0d562 to honeycomb-plus-aosp
Change-Id: Iff9ea08b810b0d142a9227272492c0305a9bcf42
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -123,10 +123,10 @@ LOCAL_SRC_FILES += \ core/java/android/nfc/ILlcpServiceSocket.aidl \ core/java/android/nfc/ILlcpSocket.aidl \ core/java/android/nfc/INfcAdapter.aidl \ + core/java/android/nfc/INfcAdapterExtras.aidl \ core/java/android/nfc/INfcTag.aidl \ core/java/android/nfc/IP2pInitiator.aidl \ core/java/android/nfc/IP2pTarget.aidl \ - core/java/android/nfc/INfcSecureElement.aidl \ core/java/android/os/IHardwareService.aidl \ core/java/android/os/IMessenger.aidl \ core/java/android/os/INetworkManagementService.aidl \ |