tree e15356e5663ffb35985692b5f2c182e5647e91cc
parent 85bcf776e10ba0788346e3599c7a5d6c0aefa7fc
parent 792b00712bb1411d3b0583bcea95b43b3107fb95
author Brian Swetland <swetland@google.com> 1284599242 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1284599242 -0700

am 792b0071: do not merge - update to match ext4utils api

Merge commit '792b00712bb1411d3b0583bcea95b43b3107fb95' into gingerbread-plus-aosp

* commit '792b00712bb1411d3b0583bcea95b43b3107fb95':
  do not merge - update to match ext4utils api