tree b11de96f03aeae97ac4fd188f25a2c08c0fe85bc
parent b2292f0a2c1ab74c39dd9dcab8ce4c208c9cb4f8
parent 368d79459e8d30474dd5cbc414623c1e2f78ee98
author Paul Lawrence <paullawrence@google.com> 1433173377 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433173377 +0000

am 368d7945: (-s ours) DO NOT MERGE Enable properties in ext4enc

* commit '368d79459e8d30474dd5cbc414623c1e2f78ee98':
  DO NOT MERGE Enable properties in ext4enc