Snap for 10453938 from 64fa805c54c0b2acea3979eb0d255ba0ca7df192 to mainline-odp-release

Change-Id: I4ff882f57c907cce2cfeacf63fd95d0caa480ffd
diff --git a/library/lint-baseline-gingerbread-lib.xml b/library/lint-baseline-gingerbread-lib.xml
index 3f25063..7bbb9a7 100644
--- a/library/lint-baseline-gingerbread-lib.xml
+++ b/library/lint-baseline-gingerbread-lib.xml
@@ -3,7 +3,7 @@
 
     <issue
         id="NewApi"
-        message="`&lt;vector>` requires API level 21 (current min is 14) or building with Android Gradle plugin 1.4 or higher"
+        message="`&lt;vector>` requires API level 21 (current min is 14) or building with Android Gradle plugin 1.4.0 or higher"
         errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
         errorLine2=" ~~~~~~">
         <location
@@ -14,7 +14,7 @@
 
     <issue
         id="NewApi"
-        message="`&lt;vector>` requires API level 21 (current min is 14) or building with Android Gradle plugin 1.4 or higher"
+        message="`&lt;vector>` requires API level 21 (current min is 14) or building with Android Gradle plugin 1.4.0 or higher"
         errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
         errorLine2=" ~~~~~~">
         <location
diff --git a/library/lint-baseline.xml b/library/lint-baseline.xml
new file mode 100644
index 0000000..d6b6dd2
--- /dev/null
+++ b/library/lint-baseline.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="6" by="lint 8.0.0-dev" type="baseline" dependencies="true" variant="all" version="8.0.0-dev">
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 25 (current min is 23): `android.view.View#setRevealOnFocusHint`">
+        <location
+            file="frameworks/opt/setupwizard/library/platform/src/com/android/setupwizardlib/view/RichTextView.java"
+            line="129"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="`&lt;vector&gt;` requires API level 21 (current min is 14) or building with Android Gradle plugin 1.4 or higher">
+        <location
+            file="frameworks/opt/setupwizard/library/gingerbread/res/drawable/suw_ic_expand_less.xml"
+            line="18"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="`&lt;vector&gt;` requires API level 21 (current min is 14) or building with Android Gradle plugin 1.4 or higher">
+        <location
+            file="frameworks/opt/setupwizard/library/gingerbread/res/drawable/suw_ic_expand_more.xml"
+            line="18"/>
+    </issue>
+
+</issues>
\ No newline at end of file