tree 2eb376b0b6033ad76366f3ef055832f785751427
parent c064b01898175843f79dbe59b3264e93266c9cd2
parent 7582609d6196552fc15204043b39972bb6b906a0
author Tianjie Xu <xunchang@google.com> 1475011346 +0000
committer android-build-merger <android-build-merger@google.com> 1475011346 +0000

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

Change-Id: Idbaf422f605c690fe2f2ea120d10e4e37342b5e9