commit 90998b8dd78f87f86e910f4b78583483da19e154
author The Android Open Source Project <initial-contribution@android.com> Wed Aug 14 12:34:06 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 14 12:34:06 2013 -0700
tree a8409d2c53edb323ff632a8d03feffa18f10c0e7
parent 3a0da6471d00e663f679856f28409f441bec8caa
parent eb8e4d14d7cb1fa35c5c7769b2fa083590511ee0

am eb8e4d14: (-s ours) am f8fab173: am fb2188d1: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit 'eb8e4d14d7cb1fa35c5c7769b2fa083590511ee0':
  "JWR66Y"

tools/releasetools/sign_target_files_apks

diff --git a/tools/releasetools/sign_target_files_apks b/tools/releasetools/sign_target_files_apks
index 00693b8..6ed21de 100755
--- a/tools/releasetools/sign_target_files_apks
+++ b/tools/releasetools/sign_target_files_apks
@@ -237,6 +237,8 @@
         value = value.split()
         if len(value) == 2 and value[1].endswith("-keys"):
           value = value[0]
+        else:
+          value = " ".join(value)
       line = key + "=" + value
     if line != original_line:
       print "  replace: ", original_line