Merge "Restructure copy image test iterations" am: 7ac38a6fa1 am: dae41c30d3
authorKalle Raita <kraita@google.com>
Tue, 21 Feb 2017 18:18:40 +0000 (18:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 21 Feb 2017 18:18:40 +0000 (18:18 +0000)
am: 11a3c5d0a1

Change-Id: I6536bfa6ab9142f82bced640257a16edf9f12beb


Trivial merge