summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Yan Yan <evitayan@google.com> 2023-07-17 22:53:14 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-07-17 22:53:14 +0000
commitedf258add5d4bec384fd0d5bbab41d196e3a11bd (patch)
tree1cc3545c26869ec9cd51ce479258ad3e53bf24bc /libs/androidfw/FileStream.cpp
parent45ea8d3e07486a6d2f109683155bb3f4425f883e (diff)
parent12af8505bb010b7195cd89a792f1e26fcb758554 (diff)
Merge "VPN: Explicitly handle IAE from updating underlying network" into main am: a6cf261f85 am: 12af8505bb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2640153 Change-Id: I14e0b6e8a46c68ccf76a224e61ea0a8c3768108b 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