tree c5847cb89fe75b568cf76a3fc278e536c9084f0a
parent d3b93200d1568571cee4d4d8258220a8104d6e1b
parent 47aa1049e80927420b59723806fab579997a7430
author Kenny Root <kroot@android.com> 1338497029 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1338497029 -0700

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

* commit '47aa1049e80927420b59723806fab579997a7430':
  Fixes to make_ext4fs when compiled with HAVE_SELINUX.