summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Hao Dong <spdonghao@google.com> 2025-01-16 12:06:35 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2025-01-16 12:06:35 -0800
commitafdd4a6ecea0f06fdfb48d5c11b26676d874effe (patch)
treea399a712e2d5b5d6b204e5b52174bb8826c83d93 /libs/androidfw/FileStream.cpp
parent008d7d3d27a2afd0e20595a98bee2f8f2d472844 (diff)
parent29f2952e1692b5f8958ab54f0d4961b6d82e72f7 (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 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: I209b94e1c2779e888d1e5d6929d36fe8bd2f3caa 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