tree f7049a00131c89d1a8eb8980abf9f1a4a210d302
parent a3091bec956d102a4afa42be3a35a151d3065676
parent da068042443cf968773bd9c7f2ca8e2ae8e59a05
author The Android Open Source Project <initial-contribution@android.com> 1354228100 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354228100 -0800

am da068042: Reconcile with jb-mr1-release - do not merge

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