tree 7b3de02f6bcfdd648002a6dbc4f4b61d2be21eb6
parent 3fb91140ecf79297df96a40306fd9f33a8536feb
parent 181d514cf13969ac7899d4b82a0f3a92f5cfc888
author Tianjie Xu <xunchang@google.com> 1501192170 +0000
committer android-build-merger <android-build-merger@google.com> 1501192170 +0000

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

Change-Id: I0b7d24cea07ce9c51550ca73d36a457d6deddc8e