tree c3591057b1afcf7e3351cf529147a2d4f9637b54
parent 01be7c239c68c07612992099226433e55b774eae
parent 6284825f22e63a2717d7e2abc4f5dda93f33c039
author Tianjie Xu <xunchang@google.com> 1497318413 +0000
committer android-build-merger <android-build-merger@google.com> 1497318413 +0000

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

Change-Id: I4995070433e9f35a30e47aaf7045eeb14d31dc5b