summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Achim Thesmann <achim@google.com> 2025-03-10 20:50:36 -0700
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2025-03-10 20:50:36 -0700
commita46321f6b00c6367239e9b178788bf27eece0917 (patch)
treed2e4e4838efe942c914776e48edc735c1db8d4d0 /libs/androidfw/AssetsProvider.cpp
parent4f4df7c67f776343478a82ba3dee2d9f2bf88721 (diff)
parent403e7f67ebdbd8da02b41d8601027d23e23082bb (diff)
[automerger skipped] Merge "RESTRICT AUTOMERGE Clear the BAL allowlist duration" into tm-dev am: 2a2c87efed am: 93a84f5004 -s ours am: 54b6f4e241 -s ours am: f44f8437c6 -s ours am: 7eb756cf98 -s ours am: 403e7f67eb -s ours
am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/31236319 Change-Id: I98ef620fc4ffdd4b42d1bfd3644b28bd9a0512e1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions