tree 6b8c68de732e2405ebc1398d1b65f1da6a598e0c
parent 38758c6c49759d661f6bf89e630888b633fdfadd
parent aeaa20897155ecd7c5a2a65adec6dc06ac4004b5
author Treehugger Robot <treehugger-gerrit@google.com> 1607393891 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1607393891 +0000

Merge "Update Android.bp following XNNPACK rebase" am: aeaa208971

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I90f742859df3cab19a5b89e5dc9ce2b4730567ff