tree af55ef79de0d265420b57056b997a243648120e8
parent cf11590f650b95d58ed72723f133ddbd0b484622
parent 4a54a4917d4c52317e6784444dca10eb2fbe9bee
author Ryan Prichard <rprichard@google.com> 1684549316 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1684549316 +0000

Merge "Fixes for versioner guard generation" am: e98bf160eb am: a6a1edd4d9 am: cf50f36539 am: 173a51a4fe am: 4a54a4917d

Original change: https://android-review.googlesource.com/c/platform/bionic/+/2595561

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