summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Makoto Onuki <omakoto@google.com> 2025-01-24 10:26:31 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2025-01-24 10:26:31 -0800
commit5aae4e2a4dfe18eda786e6940b373dfca41b9675 (patch)
tree868e5fa7c5b56db4a0cc679824e58d8092a0f558 /libs/androidfw/AssetsProvider.cpp
parentb11886a43a1c9894250bc117ea16abd88911819f (diff)
parent826cc8b1a88d4ef527da169b00a4863cd5253cf6 (diff)
Merge "[ravenwood] Promote "ignore" to an annotation" into main am: cb42d80c50 am: 826cc8b1a8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3463811 Change-Id: Iba86f07f516adb43258b66974af5c8e701a0cc92 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