tree b31e4502bcc4cc61e2eb41cb2047ed48cbe616af
parent 5a7a3aca1383b3a95070233082d0042706ac4aa9
parent b5363b2dbc1a4859cb9c95c7b0aea7b109b4dc2e
author Tao Bao <tbao@google.com> 1498679094 +0000
committer android-build-merger <android-build-merger@google.com> 1498679094 +0000

Merge "Support replacing AVB signing keys." am: 682849976d
am: b5363b2dbc

Change-Id: I8388e8c3c3bf801d7a9d50f111e91555b933a4d7