summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-11-15 00:08:55 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2022-11-15 00:08:55 +0000
commitcee5e47a158b033377e620ecc02f0f8242d0881a (patch)
tree0d8f789646e4a83ff07abdc81605da4dc0683b0a /libs/androidfw/AssetsProvider.cpp
parent81c4fd80412d1e76d6f942fa9a12efbe6c52c404 (diff)
parent811d18fcb632b9c93fe573783f4e2f9ee375359d (diff)
Merge changes from topic "am-039e403088cd4f18a656c3a5d89a8981"
* changes: [automerger skipped] Merge "Add new owner to the resume-on-reboot module." into android13-tests-dev am: 55ff235419 -s ours [automerger skipped] Add new owner to the resume-on-reboot module. am: 483f02cf02 -s ours
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions