From: Tao Bao <tbao@google.com>
Date: Fri, 17 Jun 2016 22:10:04 +0000 (+0000)
Subject: Merge \"Replace OTA keys when signing for A/B devices.\" into nyc-mr1-dev
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=827e9dfd38;p=android-x86%2Fbuild.git

Merge \"Replace OTA keys when signing for A/B devices.\" into nyc-mr1-dev
am: 008babb191

Change-Id: I7062b5245187446c686ff58391dda7286e5ac887
---

827e9dfd38273beb3b21851f4a7ec953c0adf779