tree d76e01a6e395853fc5f41a865a60f2ee2f512a86
parent 23c0523157bb278597426c829f673cae03699dcb
parent a6a1edd4d99b41ddc389a9933e5dbf51ecf1de32
author Ryan Prichard <rprichard@google.com> 1684540611 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1684540611 +0000

Merge "Fixes for versioner guard generation" am: e98bf160eb am: a6a1edd4d9

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

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