tree ce16e0e65c460aaba4b7994c7d5bf8792b8cffcf
parent 1040ae5833093a567bab2d97d1e46c47600b38a7
parent b0d0ee3c7db0dcbfc822935540c90cfd01cbf270
author Tianjie Xu <xunchang@google.com> 1475011676 +0000
committer android-build-merger <android-build-merger@google.com> 1475011676 +0000

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

Change-Id: Ie44169accea9196457d7cae696836c3a6fe14c8e