summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Hao Dong <spdonghao@google.com> 2025-01-16 13:33:16 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2025-01-16 13:33:16 -0800
commit2812ccfd1e5afd2614a75fc231e1aa0cf1797c3f (patch)
treebac95dc0d0989cc525ce9593b0d6d8276a6cd1c1 /libs/androidfw/FileStream.cpp
parent94ca65ce7cde134cf1cf6d93dda550e758ef14f3 (diff)
parent6eaad8148a817e25e94644a298b78800d0a6709d (diff)
[automerger skipped] Merge "Fix settings activity showing background bp when createConfirmDeviceCredentialIntent() API is used." into tm-dev am: 6b22d7cfb9 am: 4d3b791f15 -s ours am: 29f2952e16 -s ours am: afdd4a6ece -s ours am: 5694ebed37 -s ours am: 6eaad8148a -s ours
am skip reason: Merged-In I722e285cd15869799b9fadd2324014cf3c6d44ad with SHA-1 0842ced90c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/28783068 Change-Id: Ia6eee066c3171d202c59b55fe29fc2ff41814993 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