| commit | 6af1b87cbcfb85d2845212947916da776d97b608 | [log] [tgz] |
|---|---|---|
| author | Tom Cherry <tomcherry@google.com> | Fri Jul 14 23:14:15 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jul 14 23:14:15 2017 +0000 |
| tree | 5b696dbf9b6ca42d836a570c86bc8c57df1d2d4f | |
| parent | 1965c510e4f829f6cb0550c631d195c86da2d514 [diff] | |
| parent | 4e02dcd7d0e3851b68440b394b923a7b0e9c7ebd [diff] |
Merge changes from topic 'ext4_encryption_flag' am: 7ce805c97e am: 4e02dcd7d0 Change-Id: I562edcdf7fb0c8b84edfaf400702ce17d528c817