am 1a29ea8a: am 0a2ce08f: Merge "Support block OTA + OEM partition"

* commit '1a29ea8ae81244eb75668536089cbd34db0f949c':
This commit is contained in:
Michael Runge 2014-05-12 23:31:00 +00:00 committed by Android Git Automerger
commit 02ba307fe6

Diff Content Not Available