tree 28fb3a0d8e4e41d494069133308d45a6ff0a15df
parent a109b2589525f7c9a15dfc99f1fbaba319737da7
parent c7fed4240323383a12fd10adad91cc767404e2f0
author Tianjie Xu <xunchang@google.com> 1497316498 +0000
committer android-build-merger <android-build-merger@google.com> 1497316498 +0000

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

Change-Id: I196fe22ce901383f3349b99823f066d1226fa4fb