Merge pull request #33 from nitta-lab-2020/VoiceActivity2
VoiceActivity2
1001
1008
10261
10262
10263
1029
10291
10292
1110
11101
2020
CategoryRest
Dialog(Category)
PLM
PLM2
PlayListManager
Playbutton
Shinji_1105
VoiceEdit
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
|
---|
.idea/misc.xml |
---|
app/src/main/AndroidManifest.xml |
---|
app/src/main/java/org/ntlab/amaryllis/client/VoiceActivity.java 0 → 100644 |
---|
app/src/main/java/org/ntlab/amaryllis/client/fragment/MapsFragment.java |
---|
app/src/main/res/layout/activity_main.xml |
---|
app/src/main/res/layout/fragment_maps.xml |
---|