tree 38bab4e4ab94575b2ae4d4c181d387f39335839e
parent 95202bcba6fc0a7adcadf8af2608e06ad1288988
parent 6138b22d3544e8761c94339e5d5b7fe4f0276b98
author Android Build Merger (Role) <android-build-merger@google.com> 1499302714 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1499302714 +0000

Merge "Merge "Align size of vbmeta image to 4k boundary" am: efb6fddf39" into stage-aosp-master