tree 8728c91145cc4a37fb3315a3c8d39e8efaf5326d
parent 264caac23dbd923f96ed5cc6227cb51a5cc83169
parent a86d24829b45fd3887850b773ff9fbb1d38b11d0
author Tianjie Xu <xunchang@google.com> 1501191453 +0000
committer android-build-merger <android-build-merger@google.com> 1501191453 +0000

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

Change-Id: I841cd10a129cc95ca52b92708d844bfcc5adcdea