summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Hao Dong <spdonghao@google.com> 2025-01-16 12:27:35 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2025-01-16 12:27:35 -0800
commit598d3c19e752f029491059d7185b3edb656cb06c (patch)
tree086b31764cde063ef7bd15ef0fab164f7f2d4acd /libs/androidfw/FileStream.cpp
parente4ed72a7c72e8e89d26fa9c81bc3863163ba6539 (diff)
parent0aa1042ceac0f165630d212ad9f906d731f38232 (diff)
[automerger skipped] Merge "Fix settings activity showing background bp when createConfirmDeviceCredentialIntent() API is used." into sc-v2-dev am: 40d8b4cfae -s ours am: 475a4237d7 -s ours am: 25b22bf065 -s ours am: 84305f46b9 -s ours am: 0aa1042cea -s ours
am skip reason: Merged-In I722e285cd15869799b9fadd2324014cf3c6d44ad with SHA-1 231bda4521 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/29913418 Change-Id: Ie3a19fb01aaabb18dbafcfa98a5b26ec070e24b9 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