nitta-lab-2021:master
nitta-lab-2021:feature/#166_update_paint_ui
# Conflicts: # .idea/misc.xml # app/src/main/res/layout/activity_paint.xml