tree fc1ee2d19010c157ef7136d45f1b6f3e6eb6d22c
parent 7010bf13f329cea269de9da0d5c60c56273b48f9
parent 8dd5b2a2ccb0ac747e75846a3d909b1b0a88f5f3
author Tianjie Xu <xunchang@google.com> 1473807345 +0000
committer android-build-merger <android-build-merger@google.com> 1473807345 +0000

Merge "Check corruption when reading uncrypt_status file" am: 3cf815a6a9 am: 40bae5e1c6 am: 1d55666106
am: 8dd5b2a2cc

Change-Id: I0e82c7d7e914055df504a5293aedd49db47d9d22