Merge branch 'develop' into nea_upload_files
authorjabarros <jabarros@solidgear.es>
Mon, 17 Nov 2014 12:49:17 +0000 (13:49 +0100)
committerjabarros <jabarros@solidgear.es>
Mon, 17 Nov 2014 12:49:17 +0000 (13:49 +0100)
commita7c4814e282520936a6e22055e66ac05438689dc
tree6a3f30a187df22396cfb142e24e7c8ec0a658100
parent297cb6b5c336a58a5a527da314154e4d3acf078b
parent3f5b3f0d1dee9eee839a24bc63d7bce610fce1d6
Merge branch 'develop' into nea_upload_files
src/com/owncloud/android/utils/DisplayUtils.java