tree 90fb816fa44d11afefe127d15756cbc21bdb93fd
parent 02cef62346629167aba743000a4b68cea577107b
parent 64bc8c0ad39927c17895a4f4bd417df25ad63a13
author Zi Wang <mrziwang@google.com> 1678252185 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1678252185 +0000

Merge "Incorporate Bazel-built fingerprint file into mixed builds" am: f20a52657d am: 64bc8c0ad3

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2473148

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