| commit | 5153cf3f778361da4d6f2bb2d7595c668c37134d | [log] [tgz] |
|---|---|---|
| author | Tom Cherry <tomcherry@google.com> | Fri Jul 14 23:22:26 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jul 14 23:22:26 2017 +0000 |
| tree | 43288fc270ae3d390cabbc6918745e8f4233c9e8 | |
| parent | 8056782ef8270b470f9a7bec889e378c8c04af13 [diff] | |
| parent | 5cc199194f744dc831371227e4873fca12d41f57 [diff] |
Merge changes from topic 'ext4_encryption_flag' am: 5be05733c2 am: 5a6226929e am: d165de95da am: e1442a5df0 Change-Id: I470057eb4ccc0536eed869114cb999daf36469dc