Merge "Fix connectivity manager test for tablet with data connection, multi-user support bug#7366674" into jb-mr1-dev

This commit is contained in:
Xia Wang
2012-10-17 12:39:57 -07:00
committed by Android (Google) Code Review

View File

@@ -72,5 +72,6 @@
<uses-permission android:name="android.permission.WAKE_LOCK" /> <uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.DEVICE_POWER" /> <uses-permission android:name="android.permission.DEVICE_POWER" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />
<uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />
</manifest> </manifest>