Merge remote-tracking branch 'remotes/upstream/material_fab' into beta
authortobiasKaminsky <tobias@kaminsky.me>
Fri, 13 Nov 2015 16:43:19 +0000 (17:43 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Fri, 13 Nov 2015 16:43:19 +0000 (17:43 +0100)
commit4e162ed4386f4388626b1b6387d54028e2466e1e
treeac2d50ce27dc497c67bbb40c740699a0d3148a15
parentd67b1990b2e31749eac83c37301847256fd4f6cf
parent080a8ab7af2bc48e3c5fa1334ae91d21073e26c2
Merge remote-tracking branch 'remotes/upstream/material_fab' into beta
src/com/owncloud/android/media/MediaService.java