diff options
| author | Sven Gothel <[email protected]> | 2012-05-04 03:56:00 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2012-05-04 03:56:00 +0200 |
| commit | e75e4e7870e5d2943d8a67c299e26ea52f2000b1 (patch) | |
| tree | efe3c43372e131e3d1171226cae1311865373895 | |
| parent | d492c9c3516b57df8d3a0043f40f61fd78869a9e (diff) | |
| parent | 4b70739956713423137a0918e834f8ed1f42fd44 (diff) | |
Merge branch 'master' into android.merged_launcher_gluegenandroid.merged_launcher_gluegen
Conflicts:
src/java/jogamp/android/launcher/ClassLoaderUtil.java
| -rw-r--r-- | src/java/jogamp/android/launcher/ClassLoaderUtil.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/java/jogamp/android/launcher/ClassLoaderUtil.java b/src/java/jogamp/android/launcher/ClassLoaderUtil.java index 750323c..b324633 100644 --- a/src/java/jogamp/android/launcher/ClassLoaderUtil.java +++ b/src/java/jogamp/android/launcher/ClassLoaderUtil.java @@ -104,7 +104,6 @@ public class ClassLoaderUtil { StringBuilder apks = new StringBuilder(); StringBuilder libs = new StringBuilder(); - // JAU libs.append("/data/data/com.jogamp.common/").append(ELEM_SEP); int apkCount = 0; String lastUserPackageName = null; // the very last one reflects the Activity |