projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a3a5cd4
8a74431
)
Merge branch 'fixed_video_playback_on_rotations' into release-1.5.6
author
masensio
<masensio@solidgear.es>
Tue, 27 May 2014 11:20:01 +0000
(13:20 +0200)
committer
masensio
<masensio@solidgear.es>
Tue, 27 May 2014 11:20:01 +0000
(13:20 +0200)
1
2
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
Simple merge