tree 649846a44828735fa3e52c7aa71205cf8f2c286e
parent aec6b4749ae4f10876e88fafedcd85e17c3a1808
parent f40f29754662ab88040582f26351e4ed0e1381e7
author Tianjie Xu <xunchang@google.com> 1497315533 +0000
committer android-build-merger <android-build-merger@google.com> 1497315533 +0000

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

Change-Id: Id60cf7cf4b82f17fd094fa011bb54a543e636f48