Merge "Remove workaround for bug that was fixed a while ago." into jb-dev

Author: adamp

core/java/com/android/internal/view/ImageButtonNoParentPress.java

@@ -49,7 +49,7 @@
                   android:textAppearance="?android:attr/textAppearanceSmall" />
     </LinearLayout>
 
-    <com.android.internal.view.ImageButtonNoParentPress
+    <ImageButton
         android:layout_width="56dp"
         android:layout_height="56dp"
         android:id="@+id/expand_button"