diff options
| author | 2025-01-09 11:22:41 -0800 | |
|---|---|---|
| committer | 2025-01-09 11:22:41 -0800 | |
| commit | f21dcbabd57cbf903a0bfd24c973560ea8d645ba (patch) | |
| tree | fbe4323567a298a1de5578a3da68c8a48c93dc8b /libs/androidfw/ApkParsing.cpp | |
| parent | 3fd1a0dd3644265d71fe0ae989b88be06a3a67e0 (diff) | |
| parent | 00aab30052db1df9367393b457d64b811f5d99b6 (diff) | |
Merge changes from topic "am-e1b9190aa6cc406ea99b11d83e3cfbc5" into main
* changes:
[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
[automerger skipped] Fix settings activity showing background bp when am: 5ce5bdd539 -s ours am: 8aeac421ac -s ours am: cd87ea1716 -s ours am: 04526580f1 -s ours am: e89140b0ff -s ours
Diffstat (limited to 'libs/androidfw/ApkParsing.cpp')
0 files changed, 0 insertions, 0 deletions