tree 530b92851fc1b55a3f344144c211ed8682c0322e
parent 9389f389f5731ccac99109b4ec2a6e3c3ac3702c
parent c222ad20eefe2b8332d921d77f3b5c61715ee9dd
author xzj <xzj@rock-chips.com> 1555708515 -0700
committer android-build-merger <android-build-merger@google.com> 1555708515 -0700

Merge "fix data encryption fail when ENCRYPTION_FLAG_NO_UI is set"
am: c222ad20ee

Change-Id: I5ebb8825b40c3ce088607f8a4aa6d4fb506f6bd5