am 31b29031: Merge "Fix issues with non-tightly packed images." into mnc-dev
authorJarkko Pöyry <jpoyry@google.com>
Tue, 12 May 2015 01:07:05 +0000 (01:07 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 12 May 2015 01:07:05 +0000 (01:07 +0000)
* commit '31b2903165d4f3a75f67a847577960dd69346c01':
  Fix issues with non-tightly packed images.


Trivial merge