tree 4f222e4c4c75caf25b631c0c414f04d960fc3dc1
parent 488d7a15f0275592e9e74b35d80206ee13adb5cc
parent 4536c470f8cf72eb81f37707e846ee09a72726bb
author Tianjie Xu <xunchang@google.com> 1483752483 +0000
committer android-build-merger <android-build-merger@google.com> 1483752483 +0000

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

Change-Id: I399f35a1bc1575f9e1fcfa5d2bb537390360505e