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

Fork: 0

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

Browse code Merge remote-tracking branch 'remotes/origin/master' into 0713 1001 1008 10261 10262 10263 1029 10291 10292 1110 11101 2020 CategoryRest Dialog(Category) PLM PLM2 PlayListManager Playbutton Shinji_1105 VoiceTest2 acfrag category crrentlocation master miyazaki1110 miyazaki1112 miyazaki1112_2 present-location set_category shinji10_26 shinji11_12 shinji_1013 shinji_1022_ test test11/12 voice_location voicememo_1112
commit 50fe558397037be5db2f40251d00f8c0d1508358 2 parents 4a8fa3c + e823782 shindominato authored on 14 Jul 2020

Browse code

1001 1008 10261 10262 10263 1029 10291 10292 1110 11101 2020 CategoryRest Dialog(Category) PLM PLM2 PlayListManager Playbutton Shinji_1105 VoiceTest2 acfrag category crrentlocation master miyazaki1110 miyazaki1112 miyazaki1112_2 present-location set_category shinji10_26 shinji11_12 shinji_1013 shinji_1022_ test test11/12 voice_location voicememo_1112

commit 50fe558397037be5db2f40251d00f8c0d1508358

2 parents 4a8fa3c + e823782

shindominato authored on 14 Jul 2020

Patch

Unified Split

Showing 4 changed files

Ignore Space Show notes View app/src/main/java/org/ntlab/amaryllis/client/VoiceActivity.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/res/layout/activity_main.xml

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

Show line notes below