am 04b4f8d1: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into jb-mr2-dev

* commit '04b4f8d11406c64b94797af67dd7530435187129':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]

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

@@ -103,6 +103,9 @@ public final class Typeface_Delegate {
         if (familyName == null) {
             familyName = DEFAULT_FAMILY;
         }
+        if (style < 0) {
+            style = Typeface.NORMAL;
+        }
 
         Typeface_Delegate newDelegate = new Typeface_Delegate(familyName, style);
         if (sFontLoader != null) {