diff options
| author | Jörg Wagner <jorwag@google.com> | 2023-07-27 12:53:17 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-07-27 12:53:17 +0000 |
| commit | a6183d5eea7bba73609e3e701498e9c6152f3613 (patch) | |
| tree | 83f01e6a11ef3f6ce2762a6d381d1b8b000fa2f4 | |
| parent | 136ed83de55831122f08ad08a4929853d019ac9f (diff) | |
| parent | dc3c19e719b3f14bad20b5ecf046bd034f0d4fc3 (diff) | |
| download | android-nn-driver-a6183d5eea7bba73609e3e701498e9c6152f3613.tar.gz | |
[automerger skipped] [conflict] Merge remote-tracking branch 'goog/main' into udc_d1 am: b0ff36ab8d am: dc3c19e719 -s ours
am skip reason: Merged-In I4294170cb0cb69cad2b4f24e3ebc21d6f9601b0e with SHA-1 dac67ca2d5 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/android-nn-driver/+/24142533
Change-Id: Iec99806468abd45c92154bf88f1a4e06ba3f0897
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
0 files changed, 0 insertions, 0 deletions