summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2024-11-11 20:23:51 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-11-11 20:23:51 +0000
commitef22105e63f06d5830fc295fa97ded5c91aaa9d3 (patch)
tree5fb32ab9b8dac94dc195fbb3b49186c61f8f0540 /libs/androidfw/AssetsProvider.cpp
parent9b842ae2ae9a98096e8996c1802835565b5c634a (diff)
parent77418d330e22070b5dd82dd63a5f00679911ec0e (diff)
[automerger skipped] Merge "Add a flag for Update Engine APIs for ART." into main am: 8af322648b am: 77418d330e -s ours
am skip reason: Merged-In I78082988e179199b009e5be781207c9114cc482a with SHA-1 79cbedfa0b is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3341706 Change-Id: Ic6fd438d5eaadf354be19e040afec55bc7cf75e5 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