Merge "Correcting 2 FC's in Dev Tools"

This commit is contained in:
Dianne Hackborn
2013-01-25 01:03:44 +00:00
committed by Gerrit Code Review

View File

@@ -25,6 +25,7 @@
<uses-permission android:name="android.permission.DUMP" /> <uses-permission android:name="android.permission.DUMP" />
<uses-permission android:name="android.permission.GET_ACCOUNTS" /> <uses-permission android:name="android.permission.GET_ACCOUNTS" />
<uses-permission android:name="android.permission.HARDWARE_TEST" /> <uses-permission android:name="android.permission.HARDWARE_TEST" />
<uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.MANAGE_ACCOUNTS" /> <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
<uses-permission android:name="android.permission.REBOOT" /> <uses-permission android:name="android.permission.REBOOT" />
@@ -117,12 +118,14 @@
</intent-filter> </intent-filter>
</activity> </activity>
<!--
<activity android:name="GLSTester" android:label="Google Login Service"> <activity android:name="GLSTester" android:label="Google Login Service">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.TEST" /> <category android:name="android.intent.category.TEST" />
</intent-filter> </intent-filter>
</activity> </activity>
-->
<activity android:name="RunningProcesses" android:label="Running processes"> <activity android:name="RunningProcesses" android:label="Running processes">
<intent-filter> <intent-filter>