commit | eff2f722c386da2ad2020fa9d2aae34293c59c26 | [log] [tgz] |
---|---|---|
author | Matías Hernández <matiashe@google.com> | Fri Apr 05 12:35:52 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 05 12:35:52 2024 +0000 |
tree | 448b65f1ac9d7968a7336ad435202382b97e2fc5 | |
parent | 69940bb054edd9ec17476a7cb7c69b8a6bf92ebd [diff] | |
parent | fc8e0c7aa229adeb589537a3a5350b709e92b349 [diff] |
[automerger skipped] Merge "Resolve message/conversation image Uris with the correct user id" into sc-dev am: 579df7d189 am: 27db525979 am: 63fc3a33b5 -s ours am: fc8e0c7aa2 -s ours am skip reason: Merged-In I11c5b39f2d9d8f0788acab43640a6d4abcd5a179 with SHA-1 83975c5157 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26693133 Change-Id: I77282278a178c1ca813e6335577f31b182599a6b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>