tree e7c6d8733a59155ee30cc33c99995426b7189f00
parent 2fa5800da94ba493d54d31ce1e71ae483bcb9a76
parent f40f29754662ab88040582f26351e4ed0e1381e7
author Tianjie Xu <xunchang@google.com> 1497311723 +0000
committer android-build-merger <android-build-merger@google.com> 1497311723 +0000

Merge "Fix the issue that uncrypt isn't called under quiescent mode" into oc-dev
am: f40f297546

Change-Id: I06fa703be593348db7eed68e3905929262e43a9c