tree 620677917f38b4015358dac80d83b3a760d9b25f
parent 2957a79725fb70ca12818a9149c1a4304080f916
parent 944fcf1709d3ba9e2755b821ccc6e543c978c229
author Haibo Huang <hhb@google.com> 1616544773 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1616544773 +0000

Merge "Update Android.bp following XNNPACK rebase" am: 4df0b5067f am: 944fcf1709

Original change: https://android-review.googlesource.com/c/platform/external/XNNPACK/+/1650467

Change-Id: If68ebb1e6e7890ca2b5c0e914802fb2c66727464