Merge "Non-compressed copy image target size (64,64,8)" am: beba5d481a am: 9bbc395b49...
authorKalle Raita <kraita@google.com>
Tue, 4 Apr 2017 19:03:52 +0000 (19:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 4 Apr 2017 19:03:52 +0000 (19:03 +0000)
am: 392263d752

Change-Id: I0007ed9a7a65cd3e7f553989241a379e4fd20401


Trivial merge