Merge branch 'android_branch' into android_translate

This commit is contained in:
Eric House 2015-08-10 07:08:03 -07:00
commit 4d4c3d99b7

View file

@ -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>