tree 85ec19618f59c22f5b4ad36c8754498c5d0df998
parent 2184bad36726518526e5d22f10426b7a39d5cd95
parent babba576ba0d1b6fb69c849848c8b01c8b585e24
author Paul Lawrence <paullawrence@google.com> 1430494467 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430494467 +0000

am babba576: Merge "Enable properties in ext4enc"

* commit 'babba576ba0d1b6fb69c849848c8b01c8b585e24':
  Enable properties in ext4enc