tree dd9d2b8ac0deae52c6774fd2271ec1eac39d755c
parent dcd272fbb115e6fdc75cf363d290f483d21f177d
parent 3ff8a5e2a418201c3a4b9086de8e4dfe87265d53
author Tianjie Xu <xunchang@google.com> 1501191112 +0000
committer android-build-merger <android-build-merger@google.com> 1501191112 +0000

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

Change-Id: Iee5b01f59b2e0532232393c0133f0bd3b11d9ccd