commit c6625a71e4a889b34dc335a290efd599056bc2b0
author David Gross <dgross@google.com> Tue Jun 19 11:38:15 2018 -0700
committer David Gross <dgross@google.com> Tue Jun 19 11:49:35 2018 -0700
tree 064c6eb8762f9887ab679a212586a7fffeab69e5
parent f839bbedd7025e9925188c87540add774809d471
parent ad2db12b3a6d1cd72b50a09ae19164e9815eb219

resolve merge conflicts of ad2db12b3a6d1cd72b50a09ae19164e9815eb219 to stage-aosp-master

BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I11175cd1624734e50adc30e63cb32f652c8f1380

current.txt

diff --git a/current.txt b/current.txt
index 4f1e86b..978f6c6 100644
--- a/current.txt
+++ b/current.txt
@@ -383,6 +383,5 @@
 
 # ABI preserving changes to HALs during Android Q
 574e8f1499436fb4075894dcae0b36682427956ecb114f17f1fe22d116a83c6b android.hardware.neuralnetworks@1.0::IPreparedModel
-b07802a3433a9abec67a41525dc04eab9efb62760414e1d37e2f72cc5ae9cb8a android.hardware.neuralnetworks@1.0::types
-bf18f51bfee84461f9831f3754f5c68ce2b29e42fe9d59ef8a33163e77f8edbf android.hardware.neuralnetworks@1.1::types
-
+1a5ae9793223658174258b523763c557abad6fb917df0b8e3cc097fc89035811 android.hardware.neuralnetworks@1.0::types
+4310eb8272f085914952f3bfb73a8f8bb477a80e8b93596f0ea5acb58546b66d android.hardware.neuralnetworks@1.1::types