tree d8cb28ec9ab876faae94cf30c5dd3c0b175428e3
parent 3ed530e2df9b1ae998851930ce23fee60f3ec382
parent 61bf3646a42f45ca59fa7305d66ca34344901a29
author Christopher Parsons <cparsons@google.com> 1696435927 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696435927 +0000

Merge "assign labels to merged_txt modules with defs" into main am: 61bf3646a4

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2765313

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