tree d65745f8b73d9a6e11c86d588cb1ce112387ee93
parent 890ccba0c36ed4b812faef9f78b3a4de6e6aea73
parent 5875285ecfe6f512b2741fab27c246420fb7cc8f
author Sami Tolvanen <samitolvanen@google.com> 1472840502 +0000
committer android-build-merger <android-build-merger@google.com> 1472840502 +0000

Merge "build_image: add padding to match partition size" am: ef5751c1ec
am: 5875285ecf

Change-Id: I6b5e882c7a980d43aad310ed925061da6d3a4c4a