summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorWink Saville <wink@google.com>2014-11-12 03:45:30 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-12 03:45:30 +0000
commitf78c50e6dae1dd760ccf2dcba60673fa74a36c86 (patch)
treea2b64a815b3c1006081a6169ca54d3d6c9b62df6 /Android.mk
parent1c53c20c276d98e5bb37f1351063368debcf3783 (diff)
parent93fc415e6219f59a5b1f2d6fd5e1647551a27742 (diff)
downloadframeworks_base-f78c50e6dae1dd760ccf2dcba60673fa74a36c86.zip
frameworks_base-f78c50e6dae1dd760ccf2dcba60673fa74a36c86.tar.gz
frameworks_base-f78c50e6dae1dd760ccf2dcba60673fa74a36c86.tar.bz2
am 93fc415e: Merge "Update SubscriptionManager API as per API council." into lmp-mr1-dev automerge: 43bbf30 automerge: e76308c
* commit '93fc415e6219f59a5b1f2d6fd5e1647551a27742': Update SubscriptionManager API as per API council.
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 11bcf45..1a6b8cc 100644
--- a/Android.mk
+++ b/Android.mk
@@ -378,6 +378,7 @@ LOCAL_SRC_FILES += \
telephony/java/com/android/internal/telephony/ITelephony.aidl \
telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl \
telephony/java/com/android/internal/telephony/ISms.aidl \
+ telephony/java/com/android/internal/telephony/ISubscriptionListener.aidl \
telephony/java/com/android/internal/telephony/IWapPushManager.aidl \
telephony/java/com/android/internal/telephony/ISub.aidl \
telephony/java/com/android/internal/telephony/IMms.aidl \