jubb 573760769c Merge remote-tracking branch 'upstream/dev' into fix_resources ... # Conflicts: # app/src/main/res/values-fr/strings.xml # app/src/main/res/values-ja/strings.xml		2021-05-18 10:09:26 +10:00
..
arrays.xml	refactor: running the remove unused resources command and cleaning up strings	2021-05-17 11:56:14 +10:00
attrs.xml	Unused code cleanup.	2020-12-07 13:45:36 +11:00
colors.xml	refactor: running the remove unused resources command and cleaning up strings	2021-05-17 11:56:14 +10:00
conversation_colors.xml	refactor: running the remove unused resources command and cleaning up strings	2021-05-17 11:56:14 +10:00
core_colors.xml	refactor: running the remove unused resources command and cleaning up strings	2021-05-17 11:56:14 +10:00
crop_area_renderer.xml	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
dimens.xml	refactor: running the remove unused resources command and cleaning up strings	2021-05-17 11:56:14 +10:00
ic_launcher_background.xml	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
ids.xml	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
integers.xml	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
material_colors.xml	refactor: running the remove unused resources command and cleaning up strings	2021-05-17 11:56:14 +10:00
strings.xml	Merge remote-tracking branch 'upstream/dev' into fix_resources	2021-05-18 10:09:26 +10:00
styles.xml	refactor: running the remove unused resources command and cleaning up strings	2021-05-17 11:56:14 +10:00
text_styles.xml	refactor: running the remove unused resources command and cleaning up strings	2021-05-17 11:56:14 +10:00
themes.xml	refactor: running the remove unused resources command and cleaning up strings	2021-05-17 11:56:14 +10:00
values.xml	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
vector_paths.xml	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00