mirror of
git://xwords.git.sourceforge.net/gitroot/xwords/xwords
synced 2025-01-09 05:24:44 +01:00
Merge branch 'android_branch' into android_translate
This commit is contained in:
commit
4d4c3d99b7
1 changed files with 3 additions and 3 deletions
|
@ -56,9 +56,9 @@
|
|||
<uses-feature android:name="android.hardware.nfc" android:required="false" />
|
||||
|
||||
<!-- GCM stuff -->
|
||||
<permission android:name="org.eehouse.android.xw4.permission.C2D_MESSAGE"
|
||||
<permission android:name="org.eehouse.android.xw4dbg.permission.C2D_MESSAGE"
|
||||
android:protectionLevel="signature" />
|
||||
<uses-permission android:name="org.eehouse.android.xw4.permission.C2D_MESSAGE" />
|
||||
<uses-permission android:name="org.eehouse.android.xw4dbg.permission.C2D_MESSAGE" />
|
||||
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
|
||||
<uses-permission android:name="android.permission.GET_ACCOUNTS" />
|
||||
<uses-permission android:name="android.permission.WAKE_LOCK" />
|
||||
|
@ -247,7 +247,7 @@
|
|||
<intent-filter>
|
||||
<action android:name="com.google.android.c2dm.intent.RECEIVE" />
|
||||
<action android:name="com.google.android.c2dm.intent.REGISTRATION" />
|
||||
<category android:name="org.eehouse.android.xw4" />
|
||||
<category android:name="org.eehouse.android.xw4dbg" />
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
|
||||
|
|
Loading…
Reference in a new issue