Concedo 7304640f72 Merge branch 'upstream' into concedo_experimental ... # Conflicts: # .github/workflows/build.yml # .github/workflows/release.yml # docs/android.md # docs/backend/hexagon/CMakeUserPresets.json # examples/llama.android/app/src/main/res/layout/activity_main.xml # examples/llama.android/app/src/main/res/layout/item_message_assistant.xml # examples/llama.android/app/src/main/res/layout/item_message_user.xml # examples/model-conversion/scripts/causal/run-org-model.py # examples/model-conversion/scripts/utils/common.py # ggml/CMakeLists.txt # ggml/src/ggml-hexagon/CMakeLists.txt # ggml/src/ggml-hexagon/htp/CMakeLists.txt # ggml/src/ggml-hexagon/htp/matmul-ops.c # tests/test-arg-parser.cpp # tools/server/README.md		2025-12-20 09:32:06 +08:00
..
include	Merge commit '4a4f7e6550' into concedo_experimental	2025-12-17 14:30:39 +08:00
src	Merge branch 'upstream' into concedo_experimental	2025-12-20 09:32:06 +08:00