commit | 2b845a5b329dbb5290dba52afe68d3ccdb4559a7 | [log] [tgz] |
---|---|---|
author | xzj <xzj@rock-chips.com> | Fri Apr 19 18:40:13 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Fri Apr 19 18:40:13 2019 -0700 |
tree | cabfc28a0a565e858da33dd4ef1d399fb985af45 | |
parent | a8d425a9272c15a6d8a1204f157169e5c00f5212 [diff] | |
parent | 3348c6e915adeebb569838371e84ee663f420a7a [diff] |
Merge "fix data encryption fail when ENCRYPTION_FLAG_NO_UI is set" am: c222ad20ee am: a921b6795e am: 3348c6e915 Change-Id: I3f83c061342202ae4ae19e42738f66d11c5cbfac