tree 01125c6c04cd48ed1fd60ac43fd55085dcab254a
parent 30d514761f699dfe6ffc0edae03008f675d41007
parent 70f8adc3a792ccfbdda72efb20214347509acd8a
author Miao Wang <miaowang@google.com> 1662170607 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1662170607 +0000

Merge remote-tracking branch 'aosp/upstream-master' into rebase_xnnpack am: 1b64d9d304 am: 782bdb7c29 am: 66e5f4ceed am: 936f298fa0 am: 70f8adc3a7

Original change: https://android-review.googlesource.com/c/platform/external/cpuinfo/+/2203158

Change-Id: Iab9a17491309988a362098d3b54bae7389dc35dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>