commit | c7dd78dda836524de8d3faf87949631808a9c7bb | [log] [tgz] |
---|---|---|
author | Tom Cherry <tomcherry@google.com> | Fri Jul 14 23:11:43 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jul 14 23:11:43 2017 +0000 |
tree | 3c6987670f39e2cd6391e8ee1c2fccbebb5c83d9 | |
parent | 56f02fb7454a363b8a4f3bb52daba7c5eec30419 [diff] | |
parent | 67e999c08cd40734c5eca668c4238a0563a0c022 [diff] |
Merge changes from topic 'ext4_encryption_flag' am: 5be05733c2 Change-Id: I242f679bb96f9ae71b624db4cbcb54dda5be5ee4