tree 435d4eedaac0ff4f56f661504fef600467b01df3
parent 1fe1d8eb05251bead4392bdfbb075ace8947237c
parent 4ab40a064d80efd9fa0479edba3faf50d80a87a9
author Tianjie Xu <xunchang@google.com> 1484076233 +0000
committer android-build-merger <android-build-merger@google.com> 1484076233 +0000

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

Change-Id: Ibfca4384125a264124a2485f0a69d6e0ea4cafab