Merge "commons" into the project root directory

This commit is contained in:
Yusuke Matsubara 2016-07-02 16:20:43 +09:00
parent d42db0612e
commit b4231bbfdc
324 changed files with 22 additions and 23 deletions

View file

@ -1,7 +1,7 @@
diff --git a/commons/AndroidManifest.xml b/commons/AndroidManifest.xml
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5ad1c77..50b16ff 100644
--- a/commons/AndroidManifest.xml
+++ b/commons/AndroidManifest.xml
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -82,14 +82,6 @@
android:label="@string/title_activity_settings"
/>