Commit e5f45b69398c72241527e1fb5419cc1f651f5c2f

Authored by wutaian
2 parents 566e1fea 5ffae181

Merge branch 'C58寸' of http://120.78.57.84/Elvis/VoteC5 into C58寸

C5/app/src/main/AndroidManifest.xml
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 xmlns:tools="http://schemas.android.com/tools" 3 xmlns:tools="http://schemas.android.com/tools"
4 package="com.sunvote.xpadapp" 4 package="com.sunvote.xpadapp"
5 android:versionCode="70" 5 android:versionCode="70"
6 - android:versionName="1.3.0.2"> <!-- android:sharedUserId="android.studentUID.system" --> 6 + android:versionName="1.3.0.3"> <!-- android:sharedUserId="android.studentUID.system" -->
7 7
8 <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"></uses-permission> 8 <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"></uses-permission>
9 <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"></uses-permission> 9 <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"></uses-permission>