| Merge branch 'master' into test | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationActivity.java | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationCanvas.java | 
|---|
| app/src/main/res/layout/activity_animation.xml | 
|---|