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

Change-Id: Idf191a6797e7ae9aec9e8e2de2583c17e1a6bdae


Trivial merge