Merge branch 'update_share_link_for_OC_8.2' of github.com:owncloud/android into updat...
authormasensio <masensio@solidgear.es>
Mon, 14 Sep 2015 11:23:29 +0000 (13:23 +0200)
committermasensio <masensio@solidgear.es>
Mon, 14 Sep 2015 11:23:29 +0000 (13:23 +0200)

Trivial merge