summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Hao Dong <spdonghao@google.com> 2025-01-16 12:29:04 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2025-01-16 12:29:04 -0800
commit218713d15cfcd3410675e649abee9182d197622f (patch)
tree086b31764cde063ef7bd15ef0fab164f7f2d4acd /libs/androidfw/FileStream.cpp
parent61ac3b6febd19a788182c456a5aa6346c664840c (diff)
parentb29d4a7d9e9a87148a79016841488f7c75150658 (diff)
[automerger skipped] Merge "Fix settings activity showing background bp when createConfirmDeviceCredentialIntent() API is used." into sc-qpr1-dev am: 6f2bb1202d -s ours am: 9483dde567 -s ours am: 4c324b7937 -s ours am: 299179256b -s ours am: b0153bc815 -s ours am: b29d4a7d9e -s ours
am skip reason: Merged-In I722e285cd15869799b9fadd2324014cf3c6d44ad with SHA-1 5ce5bdd539 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/29913473 Change-Id: I1e4aeb44f01a0829d1b0658ea9813d02ece62b5c 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