diff options
author | Wink Saville <wink@google.com> | 2014-06-12 17:02:31 -0700 |
---|---|---|
committer | Wink Saville <wink@google.com> | 2014-06-13 13:30:57 +0000 |
commit | fb40dd4d00bd3361b2535bc866e6c21eadc52558 (patch) | |
tree | 01786f3e2bc9c803801f43fb8bc942e55a06e859 /Android.mk | |
parent | 6dfa6e2a9be08a3a0f152a7b772efc8ce2469bce (diff) | |
download | frameworks_base-fb40dd4d00bd3361b2535bc866e6c21eadc52558.zip frameworks_base-fb40dd4d00bd3361b2535bc866e6c21eadc52558.tar.gz frameworks_base-fb40dd4d00bd3361b2535bc866e6c21eadc52558.tar.bz2 |
Merge kwd to master
Add initial IMS and MSIM support from klp-wireless-dev-mirror
Change-Id: Idb607c0aa32f80fe4fe1539aedea7a221e9e7f04
Diffstat (limited to 'Android.mk')
-rw-r--r-- | Android.mk | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -341,6 +341,7 @@ LOCAL_SRC_FILES += \ telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl \ telephony/java/com/android/internal/telephony/ISms.aidl \ telephony/java/com/android/internal/telephony/IWapPushManager.aidl \ + telephony/java/com/android/internal/telephony/ISub.aidl \ wifi/java/android/net/wifi/IWifiManager.aidl \ wifi/java/android/net/wifi/passpoint/IWifiPasspointManager.aidl \ wifi/java/android/net/wifi/p2p/IWifiP2pManager.aidl \ |