tree 010dda78c69434582489d6d9aa4a2205a74caf66
parent 1bbd9c68afffede1f0b45c5329cd6f488cf5eb5a
parent ceafe69fb8126369125eec3c115a45be8244c57d
author Tianjie Xu <xunchang@google.com> 1483751762 +0000
committer android-build-merger <android-build-merger@google.com> 1483751762 +0000

Merge "Retry ioctl in uncrypt if it returns block# 0"
am: ceafe69fb8

Change-Id: I5fa4c97672520c2ec47e2bbb55b55c5f54417dc7