summaryrefslogtreecommitdiff
path: root/libs/androidfw/ApkParsing.cpp
diff options
context:
space:
mode:
author Hao Dong <spdonghao@google.com> 2025-01-09 11:22:08 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2025-01-09 11:22:08 -0800
commit00aab30052db1df9367393b457d64b811f5d99b6 (patch)
tree65fed64c87db001f95108f084278974a536de1d4 /libs/androidfw/ApkParsing.cpp
parent124e6a1eb8af11c7d34b954a32d66c5305b12010 (diff)
parentab2722cdef750a8f2fc3cae6b4488d1e991424f5 (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: 1e9c502417 -s ours am: a3b5bd3b10 -s ours am: ab2722cdef -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: I2497709dcc8097f65142df75ee11a3a0b5a55c51 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ApkParsing.cpp')
0 files changed, 0 insertions, 0 deletions