tree 60b185224055d90e471e0c3600197df853bd6deb
parent 0e2779bdbb80b6f94534af0b9128ced4b6caa418
parent d270230fa49311901d8797a9e77865c37857d028
author Ying Wang <wangying@android.com> 1386803710 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1386803710 -0800

am d270230f: Merge "sign_target_files_apks: rewrite build.prop correctly in eng builds"

* commit 'd270230fa49311901d8797a9e77865c37857d028':
  sign_target_files_apks: rewrite build.prop correctly in eng builds