| commit | 4e02dcd7d0e3851b68440b394b923a7b0e9c7ebd | [log] [tgz] |
|---|---|---|
| author | Tom Cherry <tomcherry@google.com> | Fri Jul 14 23:12:05 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jul 14 23:12:05 2017 +0000 |
| tree | 5b696dbf9b6ca42d836a570c86bc8c57df1d2d4f | |
| parent | de07b527133f6f866903062e0cf37091b1d95b54 [diff] | |
| parent | 7ce805c97ec0eb915c73cc96ad0bb06bcf8355c0 [diff] |
Merge changes from topic 'ext4_encryption_flag' am: 7ce805c97e Change-Id: I11917818efdc536b35832116b4bafc7ecbaa29c7