am 3d02b48b: merge from open-source master

Merge commit '3d02b48bd95293c767563729264f007dbcff82b3'

* commit '3d02b48bd95293c767563729264f007dbcff82b3':
  Fix the layoutlib Paint.set(Paint) method.

tools/layoutlib/bridge/src/android/graphics/Paint.java

@@ -283,6 +283,8 @@ public class Paint extends _Original_Paint {
             mStyle = src.mStyle;
             mFlags = src.mFlags;
 
+            updateFontObject();
+
             super.set(src);
         }
     }