| commit | 11aade0fb715432e1509b9b18087e9023dcccb28 | [log] [tgz] |
|---|---|---|
| author | Tom Cherry <tomcherry@google.com> | Fri Jul 14 23:14:06 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jul 14 23:14:06 2017 +0000 |
| tree | 4aea4c6681de78b39b59a55c82e0c5e6b37d1e71 | |
| parent | 011d247fbdb2a05f2ca529b324e34552eff892d0 [diff] | |
| parent | c7dd78dda836524de8d3faf87949631808a9c7bb [diff] |
Merge changes from topic 'ext4_encryption_flag' am: 5be05733c2 am: 5a6226929e Change-Id: I648c45ea99d2b8695c337bbda7b0a6e45598e67e