Merge branch 'bug_hunting' into feature_previews
authorDavid A. Velasco <dvelasco@solidgear.es>
Tue, 9 Apr 2013 10:54:24 +0000 (12:54 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Tue, 9 Apr 2013 10:54:24 +0000 (12:54 +0200)
commit8638936ce70e28f64f4ffd2fddff8595d4814bf1
tree2d9caa804a130cbe02ec6e6be5d521b107949726
parent9b758dfa70610ff5a3f200dfdf94e0c519b9b621
parent7edc384f7eb5c469ebfcb82c0017f9d74335bace
Merge branch 'bug_hunting' into feature_previews
src/com/owncloud/android/ui/activity/FileDisplayActivity.java