OSDN Git Service
(root)
/
android-x86
/
packages-apps-Launcher3.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
resolved conflicts for merge of 13ef17a3 to mnc-dr-dev
[android-x86/packages-apps-Launcher3.git]
/
WallpaperPicker
/
src
/
com
/
android
/
gallery3d
/
glrenderer
/
IntArray.java
diff --git
a/WallpaperPicker/src/com/android/gallery3d/util/IntArray.java
b/WallpaperPicker/src/com/android/gallery3d/glrenderer/IntArray.java
similarity index 97%
rename from
WallpaperPicker/src/com/android/gallery3d/util/IntArray.java
rename to
WallpaperPicker/src/com/android/gallery3d/glrenderer/IntArray.java
index
2c4dc2c
..
f123624
100644
(file)
--- a/
WallpaperPicker/src/com/android/gallery3d/util/IntArray.java
+++ b/
WallpaperPicker/src/com/android/gallery3d/glrenderer/IntArray.java
@@
-14,7
+14,7
@@
* limitations under the License.
*/
-package com.android.gallery3d.
util
;
+package com.android.gallery3d.
glrenderer
;
public class IntArray {
private static final int INIT_CAPACITY = 8;