AI 144245: Fix merge conflict for megering in the CDMA changes in to master from donutburger.
Automated import of CL 144245
diff --git a/Android.mk b/Android.mk
index 7b7ca3d..d5f216c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -122,8 +122,8 @@
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 @@
ifeq (,$(ONE_SHOT_MAKEFILE))
include $(call first-makefiles-under,$(LOCAL_PATH))
endif
+
+