Merge "Pass correct units for text size in autocomplete drop down."

Author: Ben Murdoch

core/java/android/webkit/WebTextView.java

@@ -832,7 +832,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
             TextView tv =
                     (TextView) super.getView(position, convertView, parent);
             if (tv != null && mTextView != null) {
-                tv.setTextSize(mTextView.getTextSize());
+                tv.setTextSize(TypedValue.COMPLEX_UNIT_PX, mTextView.getTextSize());
             }
             return tv;
         }