diff options
author | RoboErik <epastern@google.com> | 2014-02-26 10:37:45 -0800 |
---|---|---|
committer | RoboErik <epastern@google.com> | 2014-02-26 10:37:45 -0800 |
commit | e4f0fe586f456a59fc00cc9e3d0194cc183ddeaa (patch) | |
tree | 8b01f47256b3ba96b71e866fd75ac75f036c804d /Android.mk | |
parent | 4ab174a13451071c82ec295e2f109e0b9cc15aee (diff) | |
parent | 8fb4cf1ef4ca3b3c5ea1897cc1a4f9f5dc454877 (diff) | |
download | frameworks_base-e4f0fe586f456a59fc00cc9e3d0194cc183ddeaa.zip frameworks_base-e4f0fe586f456a59fc00cc9e3d0194cc183ddeaa.tar.gz frameworks_base-e4f0fe586f456a59fc00cc9e3d0194cc183ddeaa.tar.bz2 |
resolved conflicts for merge of 8fb4cf1e to master-nova
Change-Id: I61a6fc192b0c2099af9bebdf8e9d8bbfaa4243a3
Diffstat (limited to 'Android.mk')
-rw-r--r-- | Android.mk | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -261,23 +261,23 @@ LOCAL_SRC_FILES += \ media/java/android/media/IAudioService.aidl \ media/java/android/media/IAudioFocusDispatcher.aidl \ media/java/android/media/IAudioRoutesObserver.aidl \ - media/java/android/media/IMediaController.aidl \ - media/java/android/media/IMediaControllerCallback.aidl \ media/java/android/media/IMediaHTTPConnection.aidl \ media/java/android/media/IMediaHTTPService.aidl \ media/java/android/media/IMediaRouterClient.aidl \ media/java/android/media/IMediaRouterService.aidl \ media/java/android/media/IMediaScannerListener.aidl \ media/java/android/media/IMediaScannerService.aidl \ - media/java/android/media/IMediaSession.aidl \ - media/java/android/media/IMediaSessionCallback.aidl \ - media/java/android/media/IMediaSessionManager.aidl \ media/java/android/media/IRemoteControlClient.aidl \ media/java/android/media/IRemoteControlDisplay.aidl \ media/java/android/media/IRemoteDisplayCallback.aidl \ media/java/android/media/IRemoteDisplayProvider.aidl \ media/java/android/media/IRemoteVolumeObserver.aidl \ media/java/android/media/IRingtonePlayer.aidl \ + media/java/android/media/session/IMediaController.aidl \ + media/java/android/media/session/IMediaControllerCallback.aidl \ + media/java/android/media/session/IMediaSession.aidl \ + media/java/android/media/session/IMediaSessionCallback.aidl \ + media/java/android/media/session/IMediaSessionManager.aidl \ telecomm/java/android/telecomm/ICallService.aidl \ telecomm/java/android/telecomm/ICallServiceAdapter.aidl \ telecomm/java/android/telecomm/ICallServiceLookupResponse.aidl \ |