Merge branch 'master' into acfrag

Fork: 0

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

Browse code Merge branch 'master' into acfrag 10261 10262 10263 1029 10291 10292 1110 11101 2020 Dialog(Category) PLM PLM2 PlayListManager Playbutton Shinji_1105 acfrag category crrentlocation master miyazaki1110 miyazaki1112 miyazaki1112_2 set_category shinji10_26 shinji11_12 shinji_1022_ test test11/12 voice_location voicememo_1112
commit 846254ab6c8c30ceab624799211b018e48e9ac20 2 parents da6680f + 56a556f 淺野湧悟 authored on 21 Oct 2020

Patch

Unified Split

Showing 4 changed files

Ignore Space Show notes View app/src/main/java/org/ntlab/amaryllis/client/MyDialogFragment.java 0 → 100644

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/resources/VoicememosRest.java

Ignore Space Show notes View app/src/main/res/layout/fragment_maps.xml

Show line notes below