diff options
| author | Renato Grottesi <otaner@google.com> | 2023-07-25 20:04:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-07-25 20:04:51 +0000 |
| commit | 1574b2d5f36d3bc7eec1c0156bd1099b9311d91b (patch) | |
| tree | a7d067b3c577198deffe4230397769dcab8447b2 | |
| parent | f20c2868bd04de5dc478fa670866765320d7b780 (diff) | |
| parent | 885fde38c4175c14d811825cbf6cb33fdfd74102 (diff) | |
| download | armnn-1574b2d5f36d3bc7eec1c0156bd1099b9311d91b.tar.gz | |
[automerger skipped] [conflict] Merge remote-tracking branch 'goog/main' into udc_d1 am: f3a842e1ba am: 5744706803 am: 885fde38c4 -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/+/24144427
Change-Id: I8fe85915933fd82e4d52d3f69803ec9600bf8281
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
0 files changed, 0 insertions, 0 deletions