summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2012-06-18 10:34:32 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-06-18 10:34:32 -0700
commitc92aa2e7c9112adafc5283921efe25574a95b7a4 (patch)
treeffb509d9a4339d1f30a81c7e4c7609d1bcbdcf84 /api
parent8f695c525f5baa623a8b951bd3a1fd2b5efd1ceb (diff)
parent1b4dc0fe00805f82fb4bb89a97b6b0501e117505 (diff)
downloadframeworks_base-c92aa2e7c9112adafc5283921efe25574a95b7a4.zip
frameworks_base-c92aa2e7c9112adafc5283921efe25574a95b7a4.tar.gz
frameworks_base-c92aa2e7c9112adafc5283921efe25574a95b7a4.tar.bz2
am 1b4dc0fe: Merge "Volume control in MediaRouter dialogs" into jb-dev
* commit '1b4dc0fe00805f82fb4bb89a97b6b0501e117505': Volume control in MediaRouter dialogs
Diffstat (limited to 'api')
-rw-r--r--api/current.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 0afeffd..1ee52b8 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -11582,6 +11582,7 @@ package android.media {
}
public static class MediaRouter.UserRouteInfo extends android.media.MediaRouter.RouteInfo {
+ method public android.media.RemoteControlClient getRemoteControlClient();
method public void setIconDrawable(android.graphics.drawable.Drawable);
method public void setIconResource(int);
method public void setName(java.lang.CharSequence);