commit ff4313d82215c8f57adec22e0e875c9130e2900f
author The Android Open Source Project <initial-contribution@android.com> Wed Aug 14 14:45:25 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 14 14:45:25 2013 -0700
tree 7f91b6aae5706ae9cbae9da98b0dda0a40164002
parent 23ac1da7b45114fd5d64a16074eb59e33ce378a7
parent 461cac97962d4353311d14ad092ecbe44d3097b1

am 461cac97: (-s ours) Reconcile with klp-release - do not merge

* commit '461cac97962d4353311d14ad092ecbe44d3097b1': (172 commits)
  "KRS45B"
  "KRS45"
  "KRS44C"
  "KRS44B"
  "KRS44"
  "KRS43B"
  "KRS43"
  "KRS39E"
  "KRS39D"
  KRS39C
  "KRS39B"
  "KRS39"
  "KRS38B"
  "KRS38"
  "KRS37B"
  "KRS37"
  KRS36B
  "KRS36"
  "KRS31E"
  "KRS31D"
  ...

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