diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-02-28 10:10:38 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-28 10:10:38 -0800 |
| commit | b732b7b5e8192501360edc15fb8c6399d11fb97d (patch) | |
| tree | a2fab9c785f055c9962e565896d5e4a1bdadc769 /Android.mk | |
| parent | 1649d91f781445a78ce09ed5500503fd96eb9113 (diff) | |
| parent | ce57a7f35344e76689d30f45964d1e37b78280cb (diff) | |
| download | frameworks_base-b732b7b5e8192501360edc15fb8c6399d11fb97d.zip frameworks_base-b732b7b5e8192501360edc15fb8c6399d11fb97d.tar.gz frameworks_base-b732b7b5e8192501360edc15fb8c6399d11fb97d.tar.bz2 | |
am ce57a7f3: am 6504490c: am dff6b8e7: Merge "Add --non-constant-id to aapt."
* commit 'ce57a7f35344e76689d30f45964d1e37b78280cb':
GpsLocationProvider: Clean up HAL initialization/cleanup sequence
Fixed GSM encoded network initiated position request
Ensuring thread-safe usage of DateFormat.
Fixing infinite loop for zero duration.
Fix for an infinite loop while scrolling lists.
WAPPushManager, WAP Push over SMS message handler
Add --non-constant-id to aapt.
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -187,6 +187,7 @@ LOCAL_SRC_FILES += \ telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl \ telephony/java/com/android/internal/telephony/IIccPhoneBook.aidl \ telephony/java/com/android/internal/telephony/ISms.aidl \ + telephony/java/com/android/internal/telephony/IWapPushManager.aidl \ wifi/java/android/net/wifi/IWifiManager.aidl \ telephony/java/com/android/internal/telephony/IExtendedNetworkService.aidl \ vpn/java/android/net/vpn/IVpnService.aidl \ |