diff options
| author | Fred Quintana <fredq@google.com> | 2014-02-20 21:54:02 -0800 |
|---|---|---|
| committer | Fred Quintana <fredq@google.com> | 2014-02-20 21:54:02 -0800 |
| commit | fdc253558b0e9ec5d5ac8b9ac480bf6eb2da9bd1 (patch) | |
| tree | 0c698d91ef059c55a4288b76b5e92b13f10a3dfe /AndroidManifest.xml | |
| parent | 1f2c2c560400ba60c5b9dfd6fd4f5e73b232803a (diff) | |
| parent | a7fa30f3b96fc2740e779e539e78bde906d5ec40 (diff) | |
| download | android_packages_providers_DownloadProvider-fdc253558b0e9ec5d5ac8b9ac480bf6eb2da9bd1.tar.gz android_packages_providers_DownloadProvider-fdc253558b0e9ec5d5ac8b9ac480bf6eb2da9bd1.tar.bz2 android_packages_providers_DownloadProvider-fdc253558b0e9ec5d5ac8b9ac480bf6eb2da9bd1.zip | |
resolved conflicts for merge of a7fa30f3 to master
Change-Id: Ifcdb3e10bbbb08711d3f8bdafa384e092bf1a7db
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 9ea1dc32..e8e187b2 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -55,6 +55,7 @@ <uses-permission android:name="android.permission.CONNECTIVITY_INTERNAL" /> <uses-permission android:name="android.permission.MODIFY_NETWORK_ACCOUNTING" /> <uses-permission android:name="android.permission.CLEAR_APP_CACHE" /> + <uses-permission android:name="android.permission.WAKE_LOCK" /> <application android:process="android.process.media" android:label="@string/app_label" |