tree 4791c34bde2602501d9d6d988c9b148587cb2afa
parent f02e7996e03365a62312f42fbc2a3c2b4034e7b0
parent 894176632c7295875d01cfdc273b706996c483a4
author Tianjie Xu <xunchang@google.com> 1464995278 +0000
committer android-build-merger <android-build-merger@google.com> 1464995278 +0000

resolve merge conflicts of 57ad046 to nyc-mr1-dev-plus-aosp
am: 894176632c

* commit '894176632c7295875d01cfdc273b706996c483a4':
  Call ioctl before each write on retry

Change-Id: I814e7c9409d94aed8733a9e1fc562394f8da1e76