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