tree 2db4c6817fbc5d0ae75aad41f88160e32f65d28b
parent ddc323d60253f975b4c7fca36265f8eb88ee54cc
parent 9d27e6b5ecbb42522d39384f30cb356d12e43c0f
author Android Build Merger (Role) <android-build-merger@google.com> 1499304934 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1499304934 +0000

Merge "Merge "Align size of vbmeta image to 4k boundary" am: efb6fddf39 am: 95202bcba6 am: 412138338e  -s ours am: fcca0811ca  -s ours"