diff options
| author | Kenny Root <kroot@google.com> | 2010-08-20 15:09:58 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-20 15:09:58 -0700 |
| commit | 485de781f6bd30dfb7aa1e55c4f1efb3d3b11eba (patch) | |
| tree | dd687b12471210fd83f21da2b3de3e22711c74bb /Android.mk | |
| parent | 701b710c194181765616520f6d89d450b4b6c1f5 (diff) | |
| parent | 06c81f29a61ad3568a77f111b6be93e1f437f5bd (diff) | |
| download | frameworks_base-485de781f6bd30dfb7aa1e55c4f1efb3d3b11eba.zip frameworks_base-485de781f6bd30dfb7aa1e55c4f1efb3d3b11eba.tar.gz frameworks_base-485de781f6bd30dfb7aa1e55c4f1efb3d3b11eba.tar.bz2 | |
am 06c81f29: Merge changes I8a257579,I82d16312 into gingerbread
Merge commit '06c81f29a61ad3568a77f111b6be93e1f437f5bd' into gingerbread-plus-aosp
* commit '06c81f29a61ad3568a77f111b6be93e1f437f5bd':
Add AStorageManager API to NDK
Reorganize MountService IPC
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 4 |
1 files changed, 0 insertions, 4 deletions
@@ -118,10 +118,6 @@ LOCAL_SRC_FILES += \ core/java/android/net/IThrottleManager.aidl \ core/java/android/os/IHardwareService.aidl \ core/java/android/os/IMessenger.aidl \ - core/java/android/os/storage/IMountService.aidl \ - core/java/android/os/storage/IMountServiceListener.aidl \ - core/java/android/os/storage/IMountShutdownObserver.aidl \ - core/java/android/os/storage/IObbActionListener.aidl \ core/java/android/os/INetworkManagementService.aidl \ core/java/android/os/INetStatService.aidl \ core/java/android/os/IPermissionController.aidl \ |