Merge remote-tracking branch 'remotes/origin/master' into shinji11_12

Fork: 0

nitta-lab-2020 / org.ntlab.amaryllis.client

Browse code Merge remote-tracking branch 'remotes/origin/master' into shinji11_12 master shinji11_12 test
commit ed4a2f1e48d887500927646d5d9cb9533ca88dae 2 parents b385b3d + c087af4 Shinji authored on 12 Nov 2020

Patch

Unified Split

Showing 4 changed files

Ignore Space Show notes View app/src/main/java/org/ntlab/amaryllis/client/MainActivity.java

Ignore Space Show notes View app/src/main/java/org/ntlab/amaryllis/client/fragment/MapsFragment.java

Ignore Space Show notes View app/src/main/java/org/ntlab/amaryllis/client/voiceservice/PlayListManager.java

Ignore Space Show notes View app/src/main/java/org/ntlab/amaryllis/client/voiceservice/VoiceMemo.java

Show line notes below