From: Tao Bao <tbao@google.com>
Date: Fri, 8 Jul 2016 20:02:20 +0000 (+0000)
Subject: Merge \"releasetools: Fix the payload public key replacement.\" into nyc-mr1-dev
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=98c90d1efa;p=android-x86%2Fbuild.git

Merge \"releasetools: Fix the payload public key replacement.\" into nyc-mr1-dev
am: 0821fab13a

Change-Id: I15ef57cc520cc2d55ea382688da737d57281358b
---

98c90d1efaa35ae83bd7344e32dfb9c96fec448a