resolved conflicts for merge of a7fa30f3 to master
Fred Quintana [Fri, 21 Feb 2014 05:54:02 +0000 (21:54 -0800)]
Change-Id: Ifcdb3e10bbbb08711d3f8bdafa384e092bf1a7db

1  2 
AndroidManifest.xml

@@@ -54,7 -54,7 +54,8 @@@
      <!-- TODO: replace with READ_NETWORK_POLICY permission when it exists -->
      <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"