commit f839bbedd7025e9925188c87540add774809d471
author David Gross <dgross@google.com> Tue Jun 19 09:24:13 2018 -0700
committer David Gross <dgross@google.com> Tue Jun 19 10:00:21 2018 -0700
tree 132a1ab38a2a36967fbc46c567fc7b299a25790c
parent 6a2dc249c70bd359ccb114a5f656b676b0f02dc0
parent 2a970cb851cf10115cc876190c03e0e049167ee3

resolve merge conflicts of 2a970cb851cf10115cc876190c03e0e049167ee3 to stage-aosp-master

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

current.txt

diff --git a/current.txt b/current.txt
index cc15322..4f1e86b 100644
--- a/current.txt
+++ b/current.txt
@@ -380,3 +380,9 @@
 21757d0e5dd4b7e4bd981a4a20531bca3c32271ad9777b17b74eb5a1ea508384 android.hardware.wifi.supplicant@1.1::ISupplicantStaIface
 cd4330c3196bda1d642a32abfe23a7d64ebfbda721940643af6867af3b3f0aa9 android.hardware.wifi.supplicant@1.1::ISupplicantStaIfaceCallback
 10ff2fae516346b86121368ce5790d5accdfcb73983246b813f3d488b66db45a android.hardware.wifi.supplicant@1.1::ISupplicantStaNetwork
+
+# 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
+