diff options
| author | Jörg Wagner <jorwag@google.com> | 2023-07-27 13:11:37 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-07-27 13:11:37 +0000 |
| commit | 3155f4e0167379f7ec4c637a89c51bbb9735f161 (patch) | |
| tree | a7d067b3c577198deffe4230397769dcab8447b2 | |
| parent | c81269742ec2fcea7b546d3adef11a4626b800f8 (diff) | |
| parent | 9f1afa9b75fc486cac18dca2fa298b12d3141669 (diff) | |
| download | armnn-3155f4e0167379f7ec4c637a89c51bbb9735f161.tar.gz | |
[automerger skipped] [conflict] Merge remote-tracking branch 'goog/main' into udc_d1 am: f3a842e1ba am: ce35478089 -s ours am: 9f1afa9b75 -s ours
am skip reason: Merged-In I6d3cb650df6fa98760af8f7f93933857d42e04e2 with SHA-1 2bed101d06 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/armnn/+/24142535
Change-Id: I29c8cd3a61fb3002310ddc45d8b31f88237c24cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
0 files changed, 0 insertions, 0 deletions