commit 6489892ddd04d236762424ac733b3a08def6b6ca
author Roland Levillain <rpl@google.com> Mon Nov 12 14:52:24 2018 +0000
committer Roland Levillain <rpl@google.com> Mon Nov 12 14:54:28 2018 +0000
tree 70af0833b1e614944f983a37c53f481a2ed8df75
parent e8e2f020c30e06a609f296b480533436e1669f67
parent 36f566110ac060d357dd4ca62ee6a39e84a49ec3

resolve merge conflicts of 36f566110ac060d357dd4ca62ee6a39e84a49ec3 to pi-dev-plus-aosp

Test: I solemnly swear I tested this conflict resolution.
Bug: 117479943
Change-Id: I18228d1f28ab679ea0c5a081e768e6b174511985

neuralnetworks/V1_1/target/AndroidTest.xml

diff --git a/neuralnetworks/V1_1/target/AndroidTest.xml b/neuralnetworks/V1_1/target/AndroidTest.xml
index 2f61869..672c627 100644
--- a/neuralnetworks/V1_1/target/AndroidTest.xml
+++ b/neuralnetworks/V1_1/target/AndroidTest.xml
@@ -25,7 +25,7 @@
         <option name="binary-test-source" value="_32bit::DATA/nativetest/VtsHalNeuralnetworksV1_1TargetTest/VtsHalNeuralnetworksV1_1TargetTest"/>
         <option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsHalNeuralnetworksV1_1TargetTest/VtsHalNeuralnetworksV1_1TargetTest"/>
         <option name="binary-test-type" value="hal_hidl_gtest"/>
-        <option name="test-timeout" value="5m"/>
+        <option name="test-timeout" value="7m"/>
         <option name="gtest-batch-mode" value="true"/>
     </test>
 </configuration>