[automerger skipped] Merge "Remove settings for old ArmNN HIDL backend" into udc-d1-dev am: 18dd617a65
am: 062def3b10
am: 5712371fa8
-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/+/24144073
Change-Id: I1eaaa794bc5a6279295b37d5c57ebc530ef8baf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
1c34dc162f