From 84dd44b6305b50ab8ebeb4ec96bf5e5ed1c51f82 Mon Sep 17 00:00:00 2001
From: Yifan Hong <elsk@google.com>
Date: Wed, 16 May 2018 14:26:41 -0700
Subject: [PATCH 1/4] matrix: graphics.composer@2.1-2

Test: builds
Bug: 79871481
Change-Id: Icaa31db4b6c5795474fd423a3ac65562fb6a6e6d
---
 compatibility_matrices/compatibility_matrix.3.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compatibility_matrices/compatibility_matrix.3.xml b/compatibility_matrices/compatibility_matrix.3.xml
index 9bc76ea00d..ca4252f96c 100644
--- a/compatibility_matrices/compatibility_matrix.3.xml
+++ b/compatibility_matrices/compatibility_matrix.3.xml
@@ -185,7 +185,7 @@
     </hal>
     <hal format="hidl" optional="false">
         <name>android.hardware.graphics.composer</name>
-        <version>2.1</version>
+        <version>2.1-2</version>
         <interface>
             <name>IComposer</name>
             <instance>default</instance>

From 71965a570d79caa40c46efb0ecbea6b706ec6c0e Mon Sep 17 00:00:00 2001
From: Yifan Hong <elsk@google.com>
Date: Wed, 16 May 2018 14:27:37 -0700
Subject: [PATCH 2/4] matrix: graphics.mapper@2.0-1

Test: builds
Bug: 79871481
Change-Id: I32accd4f4a20843c3491b1e5fa4508107bb275cd
---
 compatibility_matrices/compatibility_matrix.3.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compatibility_matrices/compatibility_matrix.3.xml b/compatibility_matrices/compatibility_matrix.3.xml
index ca4252f96c..8eaa843803 100644
--- a/compatibility_matrices/compatibility_matrix.3.xml
+++ b/compatibility_matrices/compatibility_matrix.3.xml
@@ -193,7 +193,7 @@
     </hal>
     <hal format="hidl" optional="false">
         <name>android.hardware.graphics.mapper</name>
-        <version>2.0</version>
+        <version>2.0-1</version>
         <interface>
             <name>IMapper</name>
             <instance>default</instance>

From 9b917bd21ab31aeb76361378a5e390669db8f1f4 Mon Sep 17 00:00:00 2001
From: Yifan Hong <elsk@google.com>
Date: Wed, 16 May 2018 14:28:10 -0700
Subject: [PATCH 3/4] matrix: nn@1.0-1

Test: builds
Bug: 79871481
Change-Id: I5d68a32dbbe740738e202aebf9cf867a39f48be8
---
 compatibility_matrices/compatibility_matrix.3.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compatibility_matrices/compatibility_matrix.3.xml b/compatibility_matrices/compatibility_matrix.3.xml
index 8eaa843803..47ccf0c85a 100644
--- a/compatibility_matrices/compatibility_matrix.3.xml
+++ b/compatibility_matrices/compatibility_matrix.3.xml
@@ -258,7 +258,7 @@
     </hal>
     <hal format="hidl" optional="true">
         <name>android.hardware.neuralnetworks</name>
-        <version>1.0</version>
+        <version>1.0-1</version>
         <interface>
             <name>IDevice</name>
             <regex-instance>.*</regex-instance>

From e18d1cd547ad1fab54d1f2b0b4efc31bca5e0383 Mon Sep 17 00:00:00 2001
From: Yifan Hong <elsk@google.com>
Date: Wed, 16 May 2018 14:31:19 -0700
Subject: [PATCH 4/4] matrix: broadcastradio@2.0::IBroadcastRadio/.*

Test: builds
Bug: 79871481
Change-Id: Icd81124f74f60443f48322ab882cb6170b61ebb7
---
 compatibility_matrices/compatibility_matrix.3.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/compatibility_matrices/compatibility_matrix.3.xml b/compatibility_matrices/compatibility_matrix.3.xml
index 47ccf0c85a..2c5d4310de 100644
--- a/compatibility_matrices/compatibility_matrix.3.xml
+++ b/compatibility_matrices/compatibility_matrix.3.xml
@@ -87,6 +87,14 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="hidl" optional="true">
+        <name>android.hardware.broadcastradio</name>
+        <version>2.0</version>
+        <interface>
+            <name>IBroadcastRadio</name>
+            <regex-instance>.*</regex-instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>android.hardware.camera.provider</name>
         <version>2.4</version>