tree d73317f320681b260190d91fe7cb61b7ae5ec119
parent 9cc6c37a54626a4d23599fa8d86ffe0bcabec55a
parent 1280fa01bd263eac1d31850fe47f8e0aa93cab82
author Tao Bao <tbao@google.com> 1445045236 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1445045236 +0000

am 1280fa01: am 09ee6daa: am bc5e85af: Merge "DO NOT MERGE releasetools: Always write the last block if it\'s padded." into mnc-dev

* commit '1280fa01bd263eac1d31850fe47f8e0aa93cab82':
  DO NOT MERGE releasetools: Always write the last block if it's padded.