diff --git a/java/lint-baseline.xml b/java/lint-baseline.xml
new file mode 100644
index 0000000..6f91923
--- /dev/null
+++ b/java/lint-baseline.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="5" by="lint 4.1.0" client="cli" variant="all" version="4.1.0">
+
+    <issue
+        id="NewApi"
+        message="Call requires API level R (current min is 29): `android.view.textclassifier.TextClassificationSessionId#getValue`"
+        errorLine1="    return TextClassificationSessionId.unflattenFromString(sessionId.getValue());"
+        errorLine2="                                                                     ~~~~~~~~">
+        <location
+            file="external/libtextclassifier/java/src/com/android/textclassifier/common/statsd/TextClassificationSessionIdConverter.java"
+            line="36"
+            column="70"/>
+    </issue>
+
+</issues>
diff --git a/notification/lint-baseline.xml b/notification/lint-baseline.xml
new file mode 100644
index 0000000..1f2ee2a
--- /dev/null
+++ b/notification/lint-baseline.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="5" by="lint 4.1.0" client="cli" variant="all" version="4.1.0">
+
+    <issue
+        id="NewApi"
+        message="Call requires API level R (current min is 29): `android.app.Notification#getContextualActions`"
+        errorLine1="    boolean hasAppGeneratedContextualActions = !notification.getContextualActions().isEmpty();"
+        errorLine2="                                                             ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="external/libtextclassifier/notification/src/com/android/textclassifier/notification/SmartSuggestionsHelper.java"
+            line="248"
+            column="62"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level R (current min is 29): `android.app.Notification#findRemoteInputActionPair`"
+        errorLine1="        notification.findRemoteInputActionPair(/* requiresFreeform */ true);"
+        errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="external/libtextclassifier/notification/src/com/android/textclassifier/notification/SmartSuggestionsHelper.java"
+            line="251"
+            column="22"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level R (current min is 29): `android.app.Notification.MessagingStyle.Message#getMessagesFromBundleArray`"
+        errorLine1="        Message.getMessagesFromBundleArray("
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="external/libtextclassifier/notification/src/com/android/textclassifier/notification/SmartSuggestionsHelper.java"
+            line="434"
+            column="17"/>
+    </issue>
+
+</issues>