| commit | 1aed8c177a9e14c6df7bd9188211d0b342fe7615 | [log] [tgz] |
|---|---|---|
| author | Matías Hernández <matiashe@google.com> | Fri Apr 05 12:54:06 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 05 12:54:06 2024 +0000 |
| tree | 604476447e09787a078a8de3dd4c965b113e8b91 | |
| parent | 14685ecab867108a277dcbabf5c0747926006490 [diff] | |
| parent | eff2f722c386da2ad2020fa9d2aae34293c59c26 [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: eff2f722c3 -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: If8d1e84b8e7ff31860ad88ced3b4dd911c6ffda1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>