tree 83dfb19ae7cc08ef4193d411f418c07f8200ce11
parent ac431948d3d3bc672ecd25e50bade26ac224ef9e
parent 854ef3b9d126b01f51a34431725756e06479f1c0
author Tianjie Xu <xunchang@google.com> 1484075544 +0000
committer android-build-merger <android-build-merger@google.com> 1484075544 +0000

Merge "Do not inject I/O fault on a retry" am: 37d74f3e20
am: 854ef3b9d1

Change-Id: Ic3939632a16b54c2b77732c48c1ace8105298e2f