projects
/
pub
/
Android
/
ownCloud.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into develop
[pub/Android/ownCloud.git]
/
src
/
com
/
owncloud
/
android
/
utils
/
DisplayUtils.java
diff --git
a/src/com/owncloud/android/utils/DisplayUtils.java
b/src/com/owncloud/android/utils/DisplayUtils.java
index
c93e792
..
999700f
100644
(file)
--- a/
src/com/owncloud/android/utils/DisplayUtils.java
+++ b/
src/com/owncloud/android/utils/DisplayUtils.java
@@
-26,6
+26,7
@@
import java.util.Date;
import java.util.HashMap;
\r
import java.util.HashSet;
\r
import java.util.Set;
\r
+import java.util.Vector;
\r
\r
import android.annotation.TargetApi;
\r
import android.content.Context;
\r
@@
-340,4
+341,5
@@
public class DisplayUtils {
}
\r
return path;
\r
}
\r
+
\r
}
\r