| commit | cb9c293a6e71cd0ea39567596b34dfbaa7afed0c | [log] [tgz] |
|---|---|---|
| author | Michael Butler <butlermichael@google.com> | Tue Oct 06 23:32:05 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Oct 06 23:32:05 2020 +0000 |
| tree | 27e4d3aa2cdb872be6fd32726b5c09327ca19f18 | |
| parent | 0cfdd53e9c5a79baea9f09687b4998f78448db58 [diff] | |
| parent | d6e46433d7140ee51e376c41c59cd12e11080e46 [diff] |
[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