diff options
| author | 2024-04-04 16:58:16 +0000 | |
|---|---|---|
| committer | 2024-04-04 16:58:16 +0000 | |
| commit | f13e3615ba301c1ebe9f07c31ba69651b894078b (patch) | |
| tree | 4f6ea6c4e585e62ce2efd720c47dd966f0fd23eb /libs/androidfw/StringPool.cpp | |
| parent | c1ed6151565d2aa7178889b0a8921e8b54e7a705 (diff) | |
| parent | ba9d44433d099e43acc778fdbf25954e1add7d4c (diff) | |
[automerger skipped] Merge "Resolve message/conversation image Uris with the correct user id" into tm-qpr-dev am: 923bcfc4a9 -s ours am: ba9d44433d -s ours
am skip reason: Merged-In I11c5b39f2d9d8f0788acab43640a6d4abcd5a179 with SHA-1 44524f06f9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26679488
Change-Id: I533f2d44af92f778b73b1eb0b8e7f256b9118d8e
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