tree 121767ee61f7cc0b109bb0eec1a1ef748115dea1
parent 3f761a84b063796d7348cb0b8189eabb94150883
parent 9e12339d403dee784659d22dce97e12f12e6b404
author Jihoon Kang <jihoonkang@google.com> 1707384209 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1707384209 +0000

Merge "Add merged txt filegroups that depend on the exportable non-updatable txt files" into main am: 9e12339d40

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

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