Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_...
authorAndy Scherzinger <info@andy-scherzinger.de>
Thu, 20 Aug 2015 11:50:44 +0000 (13:50 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Thu, 20 Aug 2015 11:50:44 +0000 (13:50 +0200)
commitd24b396d54ffd926c18cfb13687de3164ca80bc5
treea5fd80303b4fca18051f177d4e2e1d04b8f91acb
parent6219397371df39fd6f862d831705f54f9cf7dfaf
parenta46eb270ab72e28001f1b1264e5b4bda466f1adc
Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons
src/com/owncloud/android/ui/activity/FileActivity.java