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

Change-Id: Ic9236cb82742f188a0c8a385ab1371d37e852f7f


Trivial merge