Merge "Update EditText.setEllipsize JavaDoc" into nyc-dev