Merge branch 'master' of github.com:owncloud/android into resizeCache
authortobiasKaminsky <tobias@kaminsky.me>
Sat, 14 Nov 2015 15:33:22 +0000 (16:33 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Sat, 14 Nov 2015 15:33:22 +0000 (16:33 +0100)
commit0302a62af58cd305abd35ae5a6aab8a5e68329bf
treecc1c210f2a8deed8c73fe4b4ab3c7c48e8822a5c
parent11774de5414207fdf721f3fff5685c1f7ab84404
parent8331456825b5bc48f1566ba109b9a9504f67991c
Merge branch 'master' of github.com:owncloud/android into resizeCache
res/values/strings.xml