Merge "Fix issues with non-tightly packed images." into mnc-dev
authorJarkko Pöyry <jpoyry@google.com>
Tue, 12 May 2015 00:50:08 +0000 (00:50 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 12 May 2015 00:50:08 +0000 (00:50 +0000)

Trivial merge