tree d0ffcf1edd45f6d6ab27e2ab531bb68330367e3a
parent d2f336664c9f348db7a158f4983786471f9a2cf8
parent 7cdc14d8b02051c489c53dc0405b9225c7f2cd74
author Sen Jiang <senj@google.com> 1494957966 +0000
committer android-build-merger <android-build-merger@google.com> 1494957966 +0000

Merge "Add support for avbtool in custom_images." am: 8a8ca3438b
am: 7cdc14d8b0

Change-Id: I0697a6b6a612e7ad353def5f1e1497992bbb1807