tree 0dce8f29be99c0223ce917e42b491cca14087ca1
parent af53db6ba0b57579df0dd160e3933488cd302032
parent 06b4254a70197fbfb1bc0405a43d5b4cc4c0d0ba
author Tianjie Xu <xunchang@google.com> 1483752005 +0000
committer android-build-merger <android-build-merger@google.com> 1483752005 +0000

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

Change-Id: I09e0b59a433533c84f251a8c32c663a1ca8a8d3b