commit 161bec6fe4854f58d965c1a15b47bb343300ee80
author RoboErik <epastern@google.com> Thu Apr 17 15:43:15 2014 -0700
committer RoboErik <epastern@google.com> Thu Apr 17 15:43:15 2014 -0700
tree eab534f19bee1fbe7f4778d8ae1bf39bed62380c
parent a5ec9213f9848e3c8e904f182a8fbdb2e65aec30
parent 0a57a1112ff45507ef6361aabf42c97460405f47

resolved conflicts for merge of 0a57a111 to master-nova

Change-Id: Id9fad51341239051203a219d58213b9438effc50

Android.mk

diff --git a/Android.mk b/Android.mk
index 3aefb3b..2f07ca1 100644
--- a/Android.mk
+++ b/Android.mk
@@ -288,11 +288,14 @@
 	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 \
+        media/java/android/media/routeprovider/IRouteConnection.aidl \
+        media/java/android/media/routeprovider/IRouteProvider.aidl \
+        media/java/android/media/routeprovider/IRouteProviderCallback.aidl \
+        media/java/android/media/session/ISessionController.aidl \
+        media/java/android/media/session/ISessionControllerCallback.aidl \
+        media/java/android/media/session/ISession.aidl \
+        media/java/android/media/session/ISessionCallback.aidl \
+        media/java/android/media/session/ISessionManager.aidl \
 	telecomm/java/com/android/internal/telecomm/ICallService.aidl \
 	telecomm/java/com/android/internal/telecomm/ICallServiceAdapter.aidl \
 	telecomm/java/com/android/internal/telecomm/ICallServiceLookupResponse.aidl \