tree 89ae82f522442458ca1731993c3997581b79ef8b
parent 3def37fa6f8e037d39c19be9e624f15745032d08
parent 400e9bc8d3c449da234e70abe319bc2670c94298
author Kenny Root <kroot@android.com> 1338497194 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1338497194 -0700

am 400e9bc8: am 47aa1049: Merge "Fixes to make_ext4fs when compiled with HAVE_SELINUX."

* commit '400e9bc8d3c449da234e70abe319bc2670c94298':
  Fixes to make_ext4fs when compiled with HAVE_SELINUX.