diff options
| author | Wink Saville <wink@google.com> | 2014-11-24 18:13:01 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-24 18:13:01 +0000 |
| commit | 5c11e41b1af60aaaf606b3a9f190edcaba1c5e41 (patch) | |
| tree | 50eddef020245c7779ec727a4e5d32f5f9985007 /Android.mk | |
| parent | 7d612f0deba16ccd2c30be302db0c19913b9a7f4 (diff) | |
| parent | b4c5410987a6657b71fb0b86e1ef8337628241dc (diff) | |
| download | frameworks_base-5c11e41b1af60aaaf606b3a9f190edcaba1c5e41.zip frameworks_base-5c11e41b1af60aaaf606b3a9f190edcaba1c5e41.tar.gz frameworks_base-5c11e41b1af60aaaf606b3a9f190edcaba1c5e41.tar.bz2 | |
am b4c54109: am 4f1cce63: am 12c2136e: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev
* commit 'b4c5410987a6657b71fb0b86e1ef8337628241dc':
Additional changes to SubscriptionManager API as per API council.
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -379,8 +379,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/IOnSubscriptionsChangedListener.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 \ |