From: tobiasKaminsky Date: Sat, 23 May 2015 05:44:16 +0000 (+0200) Subject: Merge remote-tracking branch 'upstream/develop' into navigationDrawer_update X-Git-Tag: oc-android-1.7.2~1^2~23^2~41 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/293d636f3a1898340feb4eda47c72cbac682fe22?ds=inline;hp=293d636f3a1898340feb4eda47c72cbac682fe22 Merge remote-tracking branch 'upstream/develop' into navigationDrawer_update # Conflicts: # gradle/wrapper/gradle-wrapper.properties # owncloud-android-library # res/layout-land/account_setup.xml # res/layout/account_setup.xml # res/layout/list_item.xml # res/layout/uploader_list_item_layout.xml # res/menu/main_menu.xml # res/values/colors.xml # res/values/strings.xml # src/com/owncloud/android/MainApp.java # src/com/owncloud/android/operations/SynchronizeFolderOperation.java # src/com/owncloud/android/ui/activity/FileDisplayActivity.java # src/com/owncloud/android/ui/activity/Preferences.java # src/com/owncloud/android/ui/activity/Uploader.java # src/com/owncloud/android/ui/adapter/FileListListAdapter.java # src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java # src/com/owncloud/android/ui/fragment/OCFileListFragment.java # src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java # src/com/owncloud/android/utils/BitmapUtils.java ---