tree 7b3de02f6bcfdd648002a6dbc4f4b61d2be21eb6
parent b41d074c9d969bfe1a6b833262cc0ceb310250c9
parent ce47e3792fec84106697f7e3f1d520bb3447524b
author Tianjie Xu <xunchang@google.com> 1501191720 +0000
committer android-build-merger <android-build-merger@google.com> 1501191720 +0000

Merge "Add more specific error codes for uncrypt failures" am: 3ff8a5e2a4 am: 6f30535229 am: a86d24829b
am: ce47e3792f

Change-Id: I36e058c5f1337cd032ce561634dcf5b8a9193ce4