merge from open-source master

Change-Id: I84a8efc2d58476c72e84170c19dc692dc180b97d

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -283,6 +283,8 @@ public class Paint extends _Original_Paint {
		mStyle = src.mStyle;
		mFlags = src.mFlags;

		updateFontObject();

		super.set(src);
		}
		}