summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-02-05 19:33:37 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-02-05 19:33:37 +0000
commit875d122902141257601017cc5a11d7e9cc3f0c7f (patch)
tree764df32d434d930685850943af4d33c9707c9745 /libs/androidfw/FileStream.cpp
parentcfdc5757931d6d3eee41e492bedc6eeb5a697f7b (diff)
parent942c7f3a910517eeaa9eb8c8bbb9cc851f7a6b86 (diff)
Merge changes from topic "am-d38889e594aa4419941cf597829c5e80" into main
* changes: [automerger skipped] Merge "Enable rollback lifetime API changes during install" into main am: 1034330c5a -s ours am: 86cd412df9 -s ours [automerger skipped] Enable rollback lifetime API changes during install am: 42ef4d2aa8 -s ours am: 6dad41b8ba -s ours
Diffstat (limited to 'libs/androidfw/FileStream.cpp')
0 files changed, 0 insertions, 0 deletions