Merge remote-tracking branch 'upstream/develop' into navigationDrawer_update
authortobiasKaminsky <tobias@kaminsky.me>
Sat, 23 May 2015 05:44:16 +0000 (07:44 +0200)
committertobiasKaminsky <tobias@kaminsky.me>
Sat, 23 May 2015 05:44:16 +0000 (07:44 +0200)
commit293d636f3a1898340feb4eda47c72cbac682fe22
tree8fd650bed17e7080c03975d150cac6decd78ff63
parent6d4207a06bfa0a1bb19b8d5942b799dadfbbe608
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
src/com/owncloud/android/operations/RefreshFolderOperation.java
src/com/owncloud/android/operations/SynchronizeFolderOperation.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/ui/adapter/NavigationDrawerListAdapter.java