commit | 74a28d5f6d7567d0ac4b26ec6c6020b8fbb8f571 | [log] [tgz] |
---|---|---|
author | Paul Lawrence <paullawrence@google.com> | Mon Jun 01 15:58:45 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 01 15:58:45 2015 +0000 |
tree | b11de96f03aeae97ac4fd188f25a2c08c0fe85bc | |
parent | b8b2cb47254871836960a64d0a18f9d1a7f44de5 [diff] | |
parent | 7344a7b5afb4a2d4e1f131424a152deef7f49fc2 [diff] |
am 7344a7b5: (-s ours) am 368d7945: (-s ours) DO NOT MERGE Enable properties in ext4enc * commit '7344a7b5afb4a2d4e1f131424a152deef7f49fc2': DO NOT MERGE Enable properties in ext4enc