[automerger skipped] Merge "Remove settings for old ArmNN HIDL backend" into udc-d1-dev am: 18dd617a65
am: cbed0156a8
am: 8997216cad
-s ours
am skip reason: Merged-In I57f807934ca219460a4e589b899f933115718a70 with SHA-1 2697e86201
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/24143085
Change-Id: I1e10a031df8ca74e0df263bf3a55e583b79b4410
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
cffb1ed23b