tree 5594ed8d21addb3bb08d004bc6f1814f33bd765d
parent 86ea1724ae85e54ae037777d788ce4713804754f
parent 40bae5e1c63a7fe7cd3b64b1d13c1bbb6f18b84a
author Tianjie Xu <xunchang@google.com> 1473805712 +0000
committer android-build-merger <android-build-merger@google.com> 1473805712 +0000

Merge "Check corruption when reading uncrypt_status file" am: 3cf815a6a9
am: 40bae5e1c6

Change-Id: I098148f53065e7420e500db66f1ada0d0730a0d6