summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Hao Dong <spdonghao@google.com> 2025-01-16 12:52:24 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2025-01-16 12:52:24 -0800
commitc5283007e9b40874f0e498f81c4ee66e1c226d48 (patch)
tree9228a3698cd17c646783bdaa1cc5525649b4750e /libs/androidfw/FileStream.cpp
parent91c8132bfa017fa6bb43985a3c6bd599dff9b5f7 (diff)
parentbdd8ca7abc6e08024d3a3bd2b9787c52845d6255 (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: bdd8ca7abc -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: I707ccb4e7839fa7e89acf2ba1d2c290f99f3496a 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