Merge "Non-compressed copy image target size (64,64,8)" am: beba5d481a am: 9bbc395b49...
authorKalle Raita <kraita@google.com>
Fri, 16 Dec 2016 03:47:54 +0000 (03:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 16 Dec 2016 03:47:54 +0000 (03:47 +0000)
am: 392263d752

Change-Id: If5ba6f76846f272d317c51d36592d4f52cd2e2db


Trivial merge