commit 61f233dffb4c071bcf287654fbf91177d60f69f4
author Steven Moreland <smoreland@google.com> Tue Apr 09 21:04:11 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 09 21:04:11 2019 +0000
tree 9f178c9db3719a8ac4173c5fe8fec2e9500f7804
parent fc192d58ce4f039a61d552b172f931fc66be57d3
parent a04e949c4f16953e7cbb283b00b959161bf17ec9

Merge "current FCM: broadcastradio@2.0::IBroadcastRadio/*" into qt-dev

compatibility_matrices/compatibility_matrix.3.xml

diff --git a/compatibility_matrices/compatibility_matrix.3.xml b/compatibility_matrices/compatibility_matrix.3.xml
index 4cb3776..e13d293 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.composer</name>
-        <version>2.1-3</version>
+        <version>2.1-2</version>
         <interface>
             <name>IComposer</name>
             <instance>default</instance>

current.txt

diff --git a/current.txt b/current.txt
index fcb8447..a8062d3 100644
--- a/current.txt
+++ b/current.txt
@@ -514,7 +514,7 @@
 92714960d1a53fc2ec557302b41c7cc93d2636d8364a44bd0f85be0c92927ff8 android.hardware.neuralnetworks@1.2::IExecutionCallback
 36e1064c869965dee533c537cefbe87e54db8bd8cd45be7e0e93e00e8a43863a android.hardware.neuralnetworks@1.2::IPreparedModel
 e1c734d1545e1a4ae749ff1dd9704a8e594c59aea7c8363159dc258e93e0df3b android.hardware.neuralnetworks@1.2::IPreparedModelCallback
-9b3963253e521cca19fd81aeca83aee6dcfe3bdf2805c07cb2d3f64381709b71 android.hardware.neuralnetworks@1.2::types
+b75126d572c1788682a679ab53c2dbdf3fcd75f754b1370dbf09aaad0e19d397 android.hardware.neuralnetworks@1.2::types
 cf7a4ba516a638f9b82a249c91fb603042c2d9ca43fd5aad9cf6c0401ed2a5d7 android.hardware.nfc@1.2::INfc
 abf98c2ae08bf765db54edc8068e36d52eb558cff6706b6fd7c18c65a1f3fc18 android.hardware.nfc@1.2::types
 4cb252dc6372a874aef666b92a6e9529915aa187521a700f0789065c3c702ead android.hardware.power.stats@1.0::IPowerStats

neuralnetworks/1.2/types.hal

diff --git a/neuralnetworks/1.2/types.hal b/neuralnetworks/1.2/types.hal
index 67a61c1..839114f 100644
--- a/neuralnetworks/1.2/types.hal
+++ b/neuralnetworks/1.2/types.hal
@@ -3516,7 +3516,7 @@
      *      with input0.
      *
      * Outputs:
-     * * 0: The sum, a tensor of the same {@link OperandType} as input0.
+     * * 0: A tensor of the same {@link OperandType} as input0.
      *
      * Available since API level 29.
      */
@@ -3537,7 +3537,7 @@
      *      with input0.
      *
      * Outputs:
-     * * 0: The sum, a tensor of the same {@link OperandType} as input0.
+     * * 0: A tensor of the same {@link OperandType} as input0.
      *
      * Available since API level 29.
      */