Merge "Remove two read-backs from copy image tests" am: 7c1eed0087 am: 000f76f35b...
authorKalle Raita <kraita@google.com>
Mon, 9 Jan 2017 18:58:57 +0000 (18:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 9 Jan 2017 18:58:57 +0000 (18:58 +0000)
am: 2a1cf8c522

Change-Id: I1efc031ac55956cbab52b9143c39254999779fde


Trivial merge