diff options
| author | Wink Saville <wink@google.com> | 2014-11-21 02:57:27 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-21 02:57:27 +0000 |
| commit | b638b35757021fc605d0891592b70fa42c1fb475 (patch) | |
| tree | d07b6b53b769d8c8f0990aff35b78c31cf7b7bcf /Android.mk | |
| parent | 771e952ebce561a8f4805611585001433b95e2a4 (diff) | |
| parent | 49414b5b2129bf72a847c64a9f83e7b7db4511c0 (diff) | |
| download | frameworks_base-b638b35757021fc605d0891592b70fa42c1fb475.zip frameworks_base-b638b35757021fc605d0891592b70fa42c1fb475.tar.gz frameworks_base-b638b35757021fc605d0891592b70fa42c1fb475.tar.bz2 | |
am 49414b5b: am 816e19eb: Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev automerge: 1caab41
* commit '49414b5b2129bf72a847c64a9f83e7b7db4511c0':
Revert "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
@@ -378,8 +378,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 \ |