tree 63ae2ccb19df6da8bd0062dc81655569c1897be3
parent 772153b3c7fad7a1147290843d3d45f672ffa825
parent fc887a8fbad8c2c557fa4af136e190011dcac1fe
author Tianjie Xu <xunchang@google.com> 1475011526 +0000
committer android-build-merger <android-build-merger@google.com> 1475011526 +0000

Merge "Report uncrypt errors in details" am: af8b9363c6 am: 7582609d61
am: fc887a8fba

Change-Id: I5e83be10f4443c8b107821975b3506381fcbdf0c