summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Charles Chen <charlesccchen@google.com> 2023-09-11 10:10:42 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-11 10:10:42 +0000
commitaa02547102cfb82a982f88da3d7d45beb6dc5049 (patch)
treeb371f36f3dbde0d2c8801547192bf3830c4cb1e3 /libs/androidfw/FileStream.cpp
parent2f59c58ce2d52d6145f85dc232079be0f1def18a (diff)
parent0ae183181d2cea93e83867dfcd26258990f1d2dc (diff)
[automerger skipped] Merge "Fallback to default display if initial one is detached" into udc-dev am: 1f7b255b0b am: 6884adcf79 -s ours am: bece0b864d -s ours am: 0ae183181d -s ours
am skip reason: Merged-In I196bab294c182230edda54241f7b725f44f05570 with SHA-1 7d860098f5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24499331 Change-Id: Ifef2ee2e0eef036f9bd62f72e8dff5469c92e57d 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