commit c1ab3a999c386bece9a6376b026efda79fe317c4
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Thu Dec 06 19:12:27 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 06 19:12:27 2018 +0000
tree f37c4c24855bc90d2d72ed080e3d83126b21ff9a
parent bc6a68cd08960b0238d837e22fd1547d2850d2cb
parent 6a1121e27f36d5e2a5dcfe870fb1eb1ef7cb6675

Merge "docs: Javadoc fixes am: 42be03df6a am: 55496c767c"

core/res/res/values/attrs.xml

diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml
index f55e48e..8dbea38 100644
--- a/core/res/res/values/attrs.xml
+++ b/core/res/res/values/attrs.xml
@@ -6034,7 +6034,7 @@
         <attr name="insetBottom" format="fraction|dimension" />
     </declare-styleable>
 
-    <!-- Drawable used to draw animated images (gif) -->
+    <!-- Drawable used to draw animated images (gif). -->
     <declare-styleable name="AnimatedImageDrawable">
         <!-- Identifier of the image file. This attribute is mandatory.
              It must be an image file with multiple frames, e.g. gif or webp -->
@@ -8918,8 +8918,8 @@
         <attr name="name" />
     </declare-styleable>
 
-    <!-- Attributes that are read when parsing a <font> tag, which is a child of
-         <font-family>. This represents an actual font file and its attributes. -->
+    <!-- Attributes that are read when parsing a &lt;font&gt; tag, which is a child of
+         &lt;font-family&gt;. This represents an actual font file and its attributes. -->
     <declare-styleable name="FontFamilyFont">
         <!-- The style of the given font file. This will be used when the font is being loaded into
          the font stack and will override any style information in the font's header tables. If
@@ -8950,7 +8950,7 @@
         <attr name="fontVariationSettings" format="string" />
     </declare-styleable>
 
-    <!-- Attributes that are read when parsing a <fontfamily> tag. -->
+    <!-- Attributes that are read when parsing a &lt;fontfamily&gt; tag. -->
     <declare-styleable name="FontFamily">
         <!-- The authority of the Font Provider to be used for the request. -->
         <attr name="fontProviderAuthority" format="string" />