tree 0dce8f29be99c0223ce917e42b491cca14087ca1
parent 31f4bb5a2c9a6e78baac38f6f254c0f0fcd0dfaf
parent 5ec75851a7cc753d76c078f59ad31dd04be32ae1
author Tianjie Xu <xunchang@google.com> 1483752243 +0000
committer android-build-merger <android-build-merger@google.com> 1483752243 +0000

Merge "Retry ioctl in uncrypt if it returns block# 0" am: ceafe69fb8 am: 06b4254a70
am: 5ec75851a7

Change-Id: I8fc9a1e148b4b8088a2cd38ef04817c8c5ad99aa