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