tree cb728a6b3003a26884aef8852a5a6c05dea03ea9
parent b3d92f0cf60aab2aae5090c123516dc3e9b19b4b
parent 1d55666106f80ae0824ac284f82d90899575358c
author Tianjie Xu <xunchang@google.com> 1473805893 +0000
committer android-build-merger <android-build-merger@google.com> 1473805893 +0000

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

Change-Id: I2081d6803377a7bf26175a55b3b5defb7c9d09d1