Merge branch 'remove_ActionBarSherlock' into navigationDrawer_update
authormasensio <masensio@solidgear.es>
Wed, 27 May 2015 12:19:30 +0000 (14:19 +0200)
committermasensio <masensio@solidgear.es>
Wed, 27 May 2015 12:19:30 +0000 (14:19 +0200)
commitc20041d157baebede8e47a5f6837ba7dd51204f7
tree66ba277937a75e5b3589a3ca5e15c9cb6ada13da
parent0238727d1368a0357804eb3daf4e2917bfc81429
parente7493203deca0edc7edeb5fb26f2774ede84a479
Merge branch 'remove_ActionBarSherlock' into navigationDrawer_update

Conflicts:
res/menu/main_menu.xml
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/activity/FolderPickerActivity.java
src/com/owncloud/android/ui/activity/Preferences.java
src/com/owncloud/android/ui/preview/PreviewImageActivity.java
res/layout/files.xml
res/menu/main_menu.xml
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/activity/FolderPickerActivity.java
src/com/owncloud/android/ui/activity/Preferences.java
src/com/owncloud/android/ui/activity/Uploader.java
src/com/owncloud/android/ui/dialog/RemoveFileDialogFragment.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
src/com/owncloud/android/ui/preview/PreviewImageActivity.java