From: Tianjie Xu <xunchang@google.com>
Date: Tue, 13 Jun 2017 01:25:33 +0000 (+0000)
Subject: Merge "Merge "Fix the issue that uncrypt isn't called under quiescent mode" into... 
X-Git-Tag: android-x86-9.0-r1~2805
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=10e0323ba77666728233591d424c3448491ebc17;p=android-x86%2Fframeworks-base.git

Merge "Merge "Fix the issue that uncrypt isn't called under quiescent mode" into oc-dev am: f40f297546 am: d04d501ce7" into oc-dr1-dev-plus-aosp
am: 1fa1f100a3

Change-Id: I0f0da929e78146408def47e03ae9f2425849d7e9
---

10e0323ba77666728233591d424c3448491ebc17