Merge branch 'target_marshmallow' of https://github.com/owncloud/android into target_...
authorAndy Scherzinger <info@andy-scherzinger.de>
Mon, 2 Nov 2015 11:29:13 +0000 (12:29 +0100)
committerAndy Scherzinger <info@andy-scherzinger.de>
Mon, 2 Nov 2015 11:29:13 +0000 (12:29 +0100)
commite4f85de4d69d3b03bea922eaa5eced91ee821200
tree499e4deba2a92731a9842a386d049f6c034f4116
parentef80135674470b6159f94b0606548ef3aa10f994
parent30e9622ae9b470c53343e68ec0651b962322f4af
Merge branch 'target_marshmallow' of https://github.com/owncloud/android into target_marshmallow