tree 606bed5fa4922828d25403ea26f2123c7c1e49d1
parent 628e03277382b334c476b28403ee04b37845b875
parent 28b96d147019dd93f70873314571d7904ed72f31
author Zheng Zhang <zhzh@google.com> 1479623224 +0000
committer android-build-merger <android-build-merger@google.com> 1479623224 +0000

Merge "DO NOT MERGE: build_image: add padding to match partition size" into cw-f-dev
am: 28b96d1470

Change-Id: I0e565f2858dc47ba27ac105c11c184e8ace2d9b2