Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 86148318 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

[automerger skipped] Merge "NNAPI: Add OptionalTimeoutDuration to 1.3/types.t"... 

[automerger skipped] Merge "NNAPI: Add OptionalTimeoutDuration to 1.3/types.t" am: 456d54c9 am: 484a48b7 am: e677869e -s ours
am skip reason: Change-Id I6a6e46ec82b4f25d77f7e1af18cc9d6f9478e5b7 with SHA-1 a9c097ab is in history

Change-Id: I2b3c027f0a5eee79ee271545271a9975d9a499f8
parents 3a76bddd e677869e
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment