Signed-off-by: Grinch <comfymobile@gmail.com>
Merge branch 'Math' of https://github.com/ComfyMobile/matrix_helper.git

Conflicts:
	.idea/workspace.xml
	out/production/matrix_helper/grinch/edu/mm/matrix/MainActivity.class
	out/production/matrix_helper/matrix_helper.afp.apk
	out/production/matrix_helper/matrix_helper.apk
	out/production/matrix_helper/matrix_helper.unaligned.apk
	src/grinch/edu/mm/matrix/MainActivity.java
Signed-off-by: Grinch <comfymobile@gmail.com>
Signed-off-by: Grinch <comfymobile@gmail.com>
Signed-off-by: N Mikhailov <kpoleg@list.ru>
Merge branch 'master' of https://github.com/ComfyMobile/matrix_helper.git into Math

Conflicts:
	.idea/workspace.xml
	out/production/matrix_helper/matrix_helper.afp.apk
	out/production/matrix_helper/matrix_helper.apk
	out/production/matrix_helper/matrix_helper.unaligned.apk
Signed-off-by: Grinch <comfymobile@gmail.com>
Signed-off-by: N Mikhailov <kpoleg@list.ru>
Merge branch 'master' of https://github.com/ComfyMobile/matrix_helper.git into Math

Conflicts:
	.idea/workspace.xml
	out/production/matrix_helper/matrix_helper.afp.apk
	out/production/matrix_helper/matrix_helper.apk
	out/production/matrix_helper/matrix_helper.unaligned.apk
Signed-off-by: N Mikhailov <kpoleg@list.ru>