Merge changes from topic "pi_matrix" into pi-dev

am: 3569b0273f

Change-Id: I6c82b5536b11f458b28044cbe8c3ca469f3d88bf
This commit is contained in:
Yifan Hong 2018-05-16 15:53:58 -07:00 committed by android-build-merger
commit cdd39fb0d7

View file

@ -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>
@ -185,7 +193,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>
@ -193,7 +201,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>
@ -258,7 +266,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>