diff options
| author | David Gross <dgross@google.com> | 2018-06-19 11:38:15 -0700 |
|---|---|---|
| committer | David Gross <dgross@google.com> | 2018-06-19 11:49:35 -0700 |
| commit | c6625a71e4a889b34dc335a290efd599056bc2b0 (patch) | |
| tree | 064c6eb8762f9887ab679a212586a7fffeab69e5 /current.txt | |
| parent | f839bbedd7025e9925188c87540add774809d471 (diff) | |
| parent | ad2db12b3a6d1cd72b50a09ae19164e9815eb219 (diff) | |
| download | platform_hardware_interfaces-c6625a71e4a889b34dc335a290efd599056bc2b0.tar.gz platform_hardware_interfaces-c6625a71e4a889b34dc335a290efd599056bc2b0.tar.bz2 platform_hardware_interfaces-c6625a71e4a889b34dc335a290efd599056bc2b0.zip | |
resolve merge conflicts of ad2db12b3a6d1cd72b50a09ae19164e9815eb219 to stage-aosp-master
BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I11175cd1624734e50adc30e63cb32f652c8f1380
Diffstat (limited to 'current.txt')
| -rw-r--r-- | current.txt | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/current.txt b/current.txt index 4f1e86b687..978f6c6aae 100644 --- a/current.txt +++ b/current.txt @@ -383,6 +383,5 @@ cd4330c3196bda1d642a32abfe23a7d64ebfbda721940643af6867af3b3f0aa9 android.hardwar # 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 |