| commit | 5a6226929e1e3e9b9323e0e525008706006286f7 | [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 | 97e90c6bb8342f15704c10182d97ff054583b27d [diff] | |
| parent | 5be05733c2cba89471f8b7c7e22094f96da5dcf1 [diff] |
Merge changes from topic 'ext4_encryption_flag' am: 5be05733c2 Change-Id: I242f679bb96f9ae71b624db4cbcb54dda5be5ee4