commit ee8323b6297c9e0e27524805c53d0eb3b271bc93
author Dan Albert <danalbert@google.com> Fri Mar 27 16:49:01 2015 -0700
committer Dan Albert <danalbert@google.com> Fri Mar 27 23:50:31 2015 +0000
tree f15d5d4de8b48b5f1017242706bc74e418c753bf
parent 29b415aa7781b27fc4948307acc5961cd702dac2

Fix bad merge.

Change-Id: Ifdb2a2999fe13f770c239f47330e8c2c44fdfdbe

tools/releasetools/blockimgdiff.py

diff --git a/tools/releasetools/blockimgdiff.py b/tools/releasetools/blockimgdiff.py
index 925d38b..bb9cdb3 100644
--- a/tools/releasetools/blockimgdiff.py
+++ b/tools/releasetools/blockimgdiff.py
@@ -421,8 +421,8 @@
       else:
         raise ValueError("unknown transfer style '%s'\n" % xf.style)
 
-    if free_string:
-      out.append("".join(free_string))
+      if free_string:
+        out.append("".join(free_string))
 
       # sanity check: abort if we're going to need more than 512 MB if
       # stash space