diff options
| author | repo sync <hoford@google.com> | 2013-04-22 13:37:02 -0700 |
|---|---|---|
| committer | repo sync <hoford@google.com> | 2013-04-22 13:37:02 -0700 |
| commit | cd2114728c5c9ea938aece6648ee3369fccccfcc (patch) | |
| tree | b2df063da97c7832af167eabf622541b5a5eda4c /src/com/android/gallery3d/filtershow/cache | |
| parent | 47c842458bfd94f9cc695459e64ebcc4c352c79e (diff) | |
| parent | d81bba2275dc393278239aa1d5617d3d6a7bfe2a (diff) | |
| download | android_packages_apps_Snap-cd2114728c5c9ea938aece6648ee3369fccccfcc.tar.gz android_packages_apps_Snap-cd2114728c5c9ea938aece6648ee3369fccccfcc.tar.bz2 android_packages_apps_Snap-cd2114728c5c9ea938aece6648ee3369fccccfcc.zip | |
resolved conflicts for merge of a1939d22 to gb-ub-photos-carlsbad
Change-Id: Ic6759448c932823720021e85e1232736ff2085f8
Diffstat (limited to 'src/com/android/gallery3d/filtershow/cache')
| -rw-r--r-- | src/com/android/gallery3d/filtershow/cache/FilteringPipeline.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/filtershow/cache/FilteringPipeline.java b/src/com/android/gallery3d/filtershow/cache/FilteringPipeline.java index e63323b92..8202d71bb 100644 --- a/src/com/android/gallery3d/filtershow/cache/FilteringPipeline.java +++ b/src/com/android/gallery3d/filtershow/cache/FilteringPipeline.java @@ -151,7 +151,6 @@ public class FilteringPipeline implements Handler.Callback { Log.e(LOGTAG, "setOriginal called after pipeline initialization!"); return; } - Log.v(LOGTAG,"setOriginal, size " + bitmap.getWidth() + " x " + bitmap.getHeight()); mAccessoryPipeline.setOriginal(bitmap); mPreviewPipeline.setOriginal(bitmap); mHighresPreviewPipeline.setOriginal(bitmap); |