commit b0f356579eb0348fac7157a6348f1e568556a4db
author Adam Powell <adamp@google.com> Mon Jul 09 14:15:56 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Jul 09 14:15:56 2012 -0700
tree f123aa4a30e037407a12febd0a6d29d595d98d9e
parent 13a3a87fa7264df29a1f698ce80ada2de3561962
parent 1ab2edbcff94d53856a87010e35ffa50ce4c0502

am 1ab2edbc: Merge "Fix bug in parsing attributes for MediaRouteButton" into jb-dev

* commit '1ab2edbcff94d53856a87010e35ffa50ce4c0502':
  Fix bug in parsing attributes for MediaRouteButton

core/java/android/app/MediaRouteButton.java

diff --git a/core/java/android/app/MediaRouteButton.java b/core/java/android/app/MediaRouteButton.java
index c34c163..b0bfe74 100644
--- a/core/java/android/app/MediaRouteButton.java
+++ b/core/java/android/app/MediaRouteButton.java
@@ -60,7 +60,7 @@
     }
 
     public MediaRouteButton(Context context, AttributeSet attrs) {
-        this(context, null, com.android.internal.R.attr.mediaRouteButtonStyle);
+        this(context, attrs, com.android.internal.R.attr.mediaRouteButtonStyle);
     }
 
     public MediaRouteButton(Context context, AttributeSet attrs, int defStyleAttr) {