Merge "Non-compressed copy image target size (64,64,8)"
authorKalle Raita <kraita@google.com>
Thu, 15 Dec 2016 23:37:37 +0000 (23:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 15 Dec 2016 23:37:37 +0000 (23:37 +0000)
am: beba5d481a

Change-Id: Ifa9d096019e7944b67f1bea9b7ab98214f932673


Trivial merge