tree dd9d2b8ac0deae52c6774fd2271ec1eac39d755c
parent f93a10358782a7d8e4b8f0cc1c44c5abf51f0198
parent 6f3053522989f01ab8c294317f35ebbadbb4b11e
author Tianjie Xu <xunchang@google.com> 1501191240 +0000
committer android-build-merger <android-build-merger@google.com> 1501191240 +0000

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

Change-Id: Iba392936c14c0af584b0dcb94bc65670cb94473e