tree f7049a00131c89d1a8eb8980abf9f1a4a210d302
parent d040d300cbac8d6dd609531f88fcc2667ebee367
parent 1275cfc50b86618f925856e9727956c7d5a02584
author Colin Cross <ccross@android.com> 1354228080 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354228080 -0800

am 1275cfc5: am 430b67d3: make_ext4fs: fix dentry padding when dentry size is 4088 or 4092

* commit '1275cfc50b86618f925856e9727956c7d5a02584':
  make_ext4fs: fix dentry padding when dentry size is 4088 or 4092