commit 8dca669c081c0b7bbb798f5c0eac31b371e7d9d5
author Chang Li <licha@google.com> Tue Oct 06 16:19:10 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 06 16:19:10 2020 +0000
tree 98d0f07d045d0c57baaf9a4e132758fc8b8410d6
parent a49208d810cab0e455339a7364f2ffdf130bb361
parent 948eb9a5c3957025d4e588296ec2c5ade1100119

Merge "Import AndroidX from build 6836159"

30/module-lib/android.jar

diff --git a/30/module-lib/android.jar b/30/module-lib/android.jar
index 82b40c3..b94d8e8 100644
--- a/30/module-lib/android.jar
+++ b/30/module-lib/android.jar
Binary files differ

31/public/api/incompatibilities.txt

diff --git a/31/public/api/incompatibilities.txt b/31/public/api/incompatibilities.txt
index 92258f4..b7fc490 100644
--- a/31/public/api/incompatibilities.txt
+++ b/31/public/api/incompatibilities.txt
@@ -1,7 +1,9 @@
 // Baseline format: 1.0
+RemovedClass: android.graphics.ColorMatrix:
+    Removed class android.graphics.ColorMatrix
 RemovedClass: android.service.voice.AlwaysOnHotwordDetector:
-    Removed class android.service.voice.AlwaysOnHotwordDetector
+
 
 
 RemovedMethod: android.service.voice.VoiceInteractionService#createAlwaysOnHotwordDetector(String, java.util.Locale, android.service.voice.AlwaysOnHotwordDetector.Callback):
-    Removed method android.service.voice.VoiceInteractionService.createAlwaysOnHotwordDetector(String,java.util.Locale,android.service.voice.AlwaysOnHotwordDetector.Callback)
+