# Conflicts: # matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt # vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt |
||
|---|---|---|
| .. | ||
| account | ||
| api | ||
| common | ||
| internal | ||
| session | ||
| InstrumentedTest.kt | ||
| LiveDataTestObserver.java | ||
| MainThreadExecutor.java | ||
| SingleThreadCoroutineDispatcher.kt | ||