summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorZach Johnson <zachoverflow@google.com>2015-05-27 23:06:41 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-27 23:06:47 +0000
commit68bca39a6a85c40638b28b7c91f154045afe5b10 (patch)
treec51f9b2a9ecb12435a9fb2c2fe76648b25ba8a83 /Android.mk
parent59ac0b14f2c67d502d7bad807d954f9a91ee43ac (diff)
parent42ecc9eb902ef90876cd345a906c24e0d58720a3 (diff)
downloadframeworks_base-68bca39a6a85c40638b28b7c91f154045afe5b10.zip
frameworks_base-68bca39a6a85c40638b28b7c91f154045afe5b10.tar.gz
frameworks_base-68bca39a6a85c40638b28b7c91f154045afe5b10.tar.bz2
Merge "Drop the "Config". Just "CarrierService". It's cleaner." into mnc-dev
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index 6875ac3..d6dac53 100644
--- a/Android.mk
+++ b/Android.mk
@@ -214,7 +214,7 @@ LOCAL_SRC_FILES += \
core/java/android/os/IUserManager.aidl \
core/java/android/os/IVibratorService.aidl \
core/java/android/security/IKeystoreService.aidl \
- core/java/android/service/carrier/ICarrierConfigService.aidl \
+ core/java/android/service/carrier/ICarrierService.aidl \
core/java/android/service/carrier/ICarrierMessagingCallback.aidl \
core/java/android/service/carrier/ICarrierMessagingService.aidl \
core/java/android/service/gatekeeper/IGateKeeperService.aidl \