Merge remote-tracking branch 'upstream/develop' into imageGrid

[pub/Android/ownCloud.git] / src / com / owncloud / android / MainApp.java

diff --git a/src/com/owncloud/android/MainApp.java b/src/com/owncloud/android/MainApp.java
index 93da139..4fdc5cb 100644 (file)
--- a/src/com/owncloud/android/MainApp.java
+++ b/src/com/owncloud/android/MainApp.java
@@ -21,6 +21,25 @@ import android.content.Context;
 
 import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.datamodel.ThumbnailsCacheManager;
+import android.app.Application;
+import android.content.Context;
+
+import com.owncloud.android.authentication.AccountUtils;
+import com.owncloud.android.datamodel.ThumbnailsCacheManager;
+import android.app.Application;
+import android.content.Context;
+
+import com.owncloud.android.authentication.AccountUtils;
+import com.owncloud.android.datamodel.ThumbnailsCacheManager;
+import android.app.Application;
+import android.content.Context;
+
+import com.owncloud.android.datamodel.ThumbnailsCacheManager;
+import android.app.Application;
+import android.content.Context;
+
+import com.owncloud.android.authentication.AccountUtils;
+import com.owncloud.android.datamodel.ThumbnailsCacheManager;
 import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;
 import com.owncloud.android.lib.common.OwnCloudClientManagerFactory.Policy;
 import com.owncloud.android.lib.common.utils.Log_OC;