Merge "Maybe it will build this time?"

This commit is contained in:
Jeff Sharkey
2016-06-03 21:57:28 +00:00
committed by Android (Google) Code Review

View File

@@ -4541,7 +4541,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
initializeScrollIndicators = true;
}
break;
case R.styleable.View_pointerShape:
case R.styleable.View_pointerIcon:
final int resourceId = a.getResourceId(attr, 0);
if (resourceId != 0) {
setPointerIcon(PointerIcon.loadCustomIcon(