Merge "Remove two read-backs from copy image tests" am: 7c1eed0087 am: 000f76f35b...
authorKalle Raita <kraita@google.com>
Tue, 22 Aug 2017 19:13:40 +0000 (19:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 19:13:40 +0000 (19:13 +0000)
am: 2287e5fd2b

Change-Id: I4e09f622e2c8836509086908174a5d7bb5dbe90d


Trivial merge