tree c3822712a7cda521ec63141435202b5b20c07bb0
parent 93168dabb94222ff052879824ea2e30ca91b2cd8
parent acff3464f84d0eaca8d167c4a9daddf4fc7ca8d2
author Ying Wang <wangying@google.com> 1284661940 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1284661940 -0700

am acff3464: (-s ours) am 671f5fb0: Don\'t increase partition size for ext4 user images. [DO NOT MERGE]

Merge commit 'acff3464f84d0eaca8d167c4a9daddf4fc7ca8d2'

* commit 'acff3464f84d0eaca8d167c4a9daddf4fc7ca8d2':
  Don't increase partition size for ext4 user images. [DO NOT MERGE]