From: David A. Velasco <dvelasco@solidgear.es>
Date: Thu, 31 Oct 2013 16:30:38 +0000 (+0100)
Subject: Merge branch 'develop' into review_build_process
X-Git-Tag: oc-android-1.5.5~140^2~4
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/797d16418437966b864cefcd21ab36b358710188?ds=inline;hp=-c

Merge branch 'develop' into review_build_process
---

797d16418437966b864cefcd21ab36b358710188
diff --combined AndroidManifest.xml
index 374151eb,951301ec..2035a9de
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@@ -92,9 -92,9 +92,9 @@@
          <activity android:name=".ui.activity.PreferencesNewSessionewSession" >
          </activity>
          
 -        <activity	android:name="com.owncloud.android.ui.preview.PreviewImageActivity" />
 +        <activity	android:name=".ui.preview.PreviewImageActivity" />
  		        
 -        <activity	android:name="com.owncloud.android.ui.preview.PreviewVideoActivity"
 +        <activity	android:name=".ui.preview.PreviewVideoActivity"
  					android:label="@string/app_name"
  					android:theme="@style/Theme.ownCloud.Fullscreen" >
  		</activity>        
@@@ -153,8 -153,6 +153,6 @@@
          <service android:name=".media.MediaService" />
          
          <activity android:name=".ui.activity.PinCodeActivity" />
-         <activity android:name=".extensions.ExtensionsAvailableActivity"></activity>
-         <activity android:name=".extensions.ExtensionsListActivity"></activity>
          <activity android:name=".ui.activity.AccountSelectActivity" android:uiOptions="none" android:label="@string/prefs_accounts"></activity>
          <activity android:name=".ui.activity.ConflictsResolveActivity"/>
          <activity android:name=".ui.activity.GenericExplanationActivity"/>