diff options
| author | Hyunyoung Song <hyunyoungs@google.com> | 2015-07-23 21:24:37 -0700 |
|---|---|---|
| committer | Hyunyoung Song <hyunyoungs@google.com> | 2015-07-23 21:24:37 -0700 |
| commit | 0c0d54637af7109ae22e21a117dba3efdaded4b5 (patch) | |
| tree | fe9ed94353b09dda232fceb64691f96dcd5db8d3 /WallpaperPicker/src/com/android/gallery3d/glrenderer/BasicTexture.java | |
| parent | cf51139c6e1d57b57177109f2177edc41edf5bbc (diff) | |
| parent | 13ef17a37e683b8ad5800e9f542b411180fbec2f (diff) | |
| download | android_packages_apps_Trebuchet-0c0d54637af7109ae22e21a117dba3efdaded4b5.tar.gz android_packages_apps_Trebuchet-0c0d54637af7109ae22e21a117dba3efdaded4b5.tar.bz2 android_packages_apps_Trebuchet-0c0d54637af7109ae22e21a117dba3efdaded4b5.zip | |
resolved conflicts for merge of 13ef17a3 to mnc-ub-dev
b/22609402
Change-Id: I80699d985088b9b79211284e710e8a6b8b90860b
Diffstat (limited to 'WallpaperPicker/src/com/android/gallery3d/glrenderer/BasicTexture.java')
| -rw-r--r-- | WallpaperPicker/src/com/android/gallery3d/glrenderer/BasicTexture.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/WallpaperPicker/src/com/android/gallery3d/glrenderer/BasicTexture.java b/WallpaperPicker/src/com/android/gallery3d/glrenderer/BasicTexture.java index 2e77b903f..0f3efb727 100644 --- a/WallpaperPicker/src/com/android/gallery3d/glrenderer/BasicTexture.java +++ b/WallpaperPicker/src/com/android/gallery3d/glrenderer/BasicTexture.java @@ -27,7 +27,6 @@ import java.util.WeakHashMap; // If a BasicTexture is loaded into GL memory, it has a GL texture id. public abstract class BasicTexture implements Texture { - @SuppressWarnings("unused") private static final String TAG = "BasicTexture"; protected static final int UNSPECIFIED = -1; |