commit | 3348c6e915adeebb569838371e84ee663f420a7a | [log] [tgz] |
---|---|---|
author | xzj <xzj@rock-chips.com> | Fri Apr 19 15:04:40 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Fri Apr 19 15:04:40 2019 -0700 |
tree | cabfc28a0a565e858da33dd4ef1d399fb985af45 | |
parent | 08a7e1302565dce776375e2be888d3603518fd56 [diff] | |
parent | a921b6795ea3566de95e8167f16b3780c986ef4b [diff] |
Merge "fix data encryption fail when ENCRYPTION_FLAG_NO_UI is set" am: c222ad20ee am: a921b6795e Change-Id: Ia297c274b7a2b0005b31f69354fb4a7773f02439