tree 596deb9ee41042228011d7fb3b0ba09685328a2a
parent 37d9ef2c36dcd3027ce79b9072577ad58e1f9247
parent e718226fa249e06b9aa59681bf6afc46ce9d4ea7
author Treehugger Robot <treehugger-gerrit@google.com> 1604411658 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1604411658 +0000

[automerger skipped] Merge "Migrate NNAPI to canonical types" am: c21732465b am: bc55f56d18 am: d61f263d69 am: e718226fa2 -s ours

am skip reason: Change-Id Ib5282e5477e7c632485a966b2fef02044ce9fb96 with SHA-1 8230f8c6f2 is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1484120

Change-Id: I7c63d7acd7d03add51a192fc0ea50f5b50f531fa