tree a8d5e6cdcecda5b508a4388dc2713770b20117a4
parent dc49ce453efee52044287a2d0139996952f71170
parent 1dcd2fd0c7cc44cae279a5088241bdf15f084cb8
author Brian Swetland <swetland@google.com> 1284605396 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1284605396 -0700

am 1dcd2fd0: (-s ours) am 792b0071: do not merge - update to match ext4utils api

Merge commit '1dcd2fd0c7cc44cae279a5088241bdf15f084cb8'

* commit '1dcd2fd0c7cc44cae279a5088241bdf15f084cb8':
  do not merge - update to match ext4utils api