commit | a1cf32e23f228debfda115d9a14590f87da7f62a | [log] [tgz] |
---|---|---|
author | Michael Butler <butlermichael@google.com> | Tue Dec 29 23:00:36 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Dec 29 23:00:36 2020 +0000 |
tree | bed2069077af6c2cf124b90278f138ec8f8fbbce | |
parent | a8f0e18049613bfefd50f6aeb0ded0a35ac83dee [diff] | |
parent | 2be17732e7655ea5bf4aa338343443bc860c4dc9 [diff] |
[automerger skipped] Merge changes from topic "nnapi-timings" am: 8f583928c7 am: ae447b1a84 am: 2be17732e7 -s ours am skip reason: Change-Id Icf37d05c884c740178324fcd046ea56914ef7d44 with SHA-1 11761e37a8 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1534941 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8e2dd67380d8485e4a3db69f580c0e534a7e3a74