| commit | d165de95da2ea86a8881fceba4de611ab8f1341e | [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 | a62497c189b782b6e82a3531f6163cece1372e61 [diff] | |
| parent | 5a6226929e1e3e9b9323e0e525008706006286f7 [diff] |
Merge changes from topic 'ext4_encryption_flag' am: 5be05733c2 am: 5a6226929e Change-Id: I648c45ea99d2b8695c337bbda7b0a6e45598e67e