summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Eric Biggers <ebiggers@google.com> 2023-08-29 21:43:05 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-29 21:43:05 +0000
commit6d85b4c3bf64f8913708cd641f93416c2b71b7d6 (patch)
tree9360af0c41aeb7a8d0a0831f71a821105e563d92 /libs/androidfw/FileStream.cpp
parent6e3c7a40e08bfad9f2bcc4e0077ccd99cf4394a7 (diff)
parent27881829e1019264462b2ccc9366f3ecc0056472 (diff)
[automerger skipped] Merge "Add jacobhobbie@google.com to trust owners." into main am: 20303070b8 -s ours am: 226a3885af -s ours am: 27881829e1 -s ours
am skip reason: Merged-In Icf3d411f9f4acfc7af28829efa061b02a997f6d4 with SHA-1 b26278bef2 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2731917 Change-Id: Ib42f8b4f064c6afc54e086fc0a605e47557286ef Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/FileStream.cpp')
0 files changed, 0 insertions, 0 deletions