[automerger skipped] Merge "Create conversions to/from NNAPI canonical types" am: f77f02bf50
am: b175b10734
am: 367198e13c
am: d6e46433d7
-s ours
am skip reason: Change-Id I0732e658c1f4ed40cd122f1ca8581fb40b056757 with SHA-1 a685c3dbf4
is in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1449138
Change-Id: I696e4d0d92c8c503cb4425f037a3631d41f5d41c
This commit is contained in:
commit
cb9c293a6e