nitta-lab-2021:master
nitta-lab-2021:PaintScreenShot
# Conflicts: # app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintActivity.java