Merge pull request #767 from ZhengQZ123/master

#95 #129
hzuapps · May 18, 2016 · 3a8b400 · 3a8b400
2 parents 3f51d4b + 25e24e2
commit 3a8b400
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/app/src/main/java/edu/hzuapps/androidworks/homeworks/net1314080903247/AndroidManifest.xml b/app/src/main/java/edu/hzuapps/androidworks/homeworks/net1314080903247/AndroidManifest.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+package="homeworks.androidworks.hzuapps.edu.net1314080903247">
+<uses-permission android:name="android.permission.INTERNET"/>
+<application
+    android:allowBackup="true"
+    android:icon="@mipmap/ic_launcher"
+    android:label="@string/app_name"
+    android:supportsRtl="true"
+    android:theme="@style/AppTheme">
+    <activity
+        android:name=".Net1314080903247Activity"
+        android:label="@string/app_name"
+        android:theme="@style/AppTheme.NoActionBar">
+        <intent-filter>
+            <action android:name="android.intent.action.MAIN" />
+
+            <category android:name="android.intent.category.LAUNCHER" />
+        </intent-filter>
+    </activity>
+</application>
+
+</manifest>
diff --git a/zqz.json b/zqz.json
@@ -0,0 +1 @@
+[{"name:"郑钦洲","number:"1314080903247","class","13网络2班"}]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		[{"name:"郑钦洲","number:"1314080903247","class","13网络2班"}]