diff options
| author | Wink Saville <> | 2009-04-02 11:00:54 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-04-02 11:00:54 -0700 |
| commit | 04e71b3db84fd5f7fc4eefb49a33154ea91ec9fc (patch) | |
| tree | 1e96e55835f059a7b4b7b89a62ca0a9d7f0a5c17 /Android.mk | |
| parent | 3afdd56470d6d4dcb20fe0f68ec9e54a167a9d74 (diff) | |
| download | frameworks_base-04e71b3db84fd5f7fc4eefb49a33154ea91ec9fc.zip frameworks_base-04e71b3db84fd5f7fc4eefb49a33154ea91ec9fc.tar.gz frameworks_base-04e71b3db84fd5f7fc4eefb49a33154ea91ec9fc.tar.bz2 | |
AI 144245: Fix merge conflict for megering in the CDMA changes in to master from donutburger.
Automated import of CL 144245
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -122,8 +122,8 @@ LOCAL_SRC_FILES += \ telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl \ telephony/java/com/android/internal/telephony/ITelephony.aidl \ telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl \ - telephony/java/com/android/internal/telephony/gsm/ISimPhoneBook.aidl \ - telephony/java/com/android/internal/telephony/gsm/ISms.aidl \ + telephony/java/com/android/internal/telephony/IIccPhoneBook.aidl \ + telephony/java/com/android/internal/telephony/ISms.aidl \ wifi/java/android/net/wifi/IWifiManager.aidl \ telephony/java/com/android/internal/telephony/IExtendedNetworkService.aidl @@ -438,3 +438,5 @@ include $(BUILD_JAVA_LIBRARY) ifeq (,$(ONE_SHOT_MAKEFILE)) include $(call first-makefiles-under,$(LOCAL_PATH)) endif + + |