diff options
| author | 2025-01-09 14:36:30 -0800 | |
|---|---|---|
| committer | 2025-01-09 14:36:30 -0800 | |
| commit | f6f5765fb453576f53aa8aebc5334269308304d9 (patch) | |
| tree | 4d43a7942dd9dd4d4c5217f8ab4bf698eb2d285d /libs/androidfw/StringPool.cpp | |
| parent | 69ec9b3258cc13159e9a67b8cde78877eb46404b (diff) | |
| parent | 65fd0965d46e09ccb4dddb2bd0b2ac9e00f37eee (diff) | |
[automerger skipped] [conflict] Merge "Fix settings activity showing background bp when createConfirmDeviceCredentialIntent() API is used." into udc-dev am: c2ac83fd98 am: fbb3aa7247 -s ours am: 65fd0965d4 -s ours
am skip reason: Merged-In I722e285cd15869799b9fadd2324014cf3c6d44ad with SHA-1 6096c017f3 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/28784459
Change-Id: Ide206c49d0ec3797e2c6b15b5dd120d1d13f63d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions