Resolved conflicts:
- libraries/matrix/impl/.../fakes/FakeFfiSpaceRoomList.kt: took upstream's
direct return for rooms() — the simulateLongTask wrapper is for IO-style
operations like paginate/reset, not a quick read.
- libraries/ui-strings/src/main/res/values/temporary.xml: kept the file with
only the live strings (action_mark_as_read, a11y_jump_to_unread_messages).
Dropped common_black (upstream moved theme strings to module-local R.string)
and a11y_jump_to_unread_messages_count (badge count was removed earlier).
- RoomInfo.kt and its fixtures/tests: took upstream's version since both
branches independently added fullyReadEventId via the same SDK bump
(matrix-rust-components-kotlin 26.05.20).
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Jenna Vassar
d653ceb84c