resolved conflicts for merge of 13ef17a3 to mnc-dr-dev

b/22609402 Change-Id: I140cf972d57e14737a6f91c0b4a8ec6c7ff1af2b
2015-07-21 17:01:26 -07:00
parent a83129f0bc
commit e612775922
630 changed files with 23761 additions and 21647 deletions
@@ -220,9 +220,6 @@ class DecoderRing {
                    if (widget.icon != null) {
                        writeImageData(widget.icon.data, prefix + "_icon.png");
                    }
-                    if (widget.preview != null) {
-                        writeImageData(widget.preview.data, prefix + "_preview.png");
-                    }
                }
            }
        }