tree 05b7aa2385d430be7c4bb8ca7a6db9f3bbc8a639
parent fb6172cf7bc73b830fd49ef6983229f228c8dcab
parent 827c662d8f145e5a0492838c951dad5d96716c71
author Jean-Baptiste Queru <jbq@google.com> 1293667332 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1293667332 -0800

am 827c662d: am e28ae87a: Merge "Use ext4 file system for generic_x86 userdata partition"

* commit '827c662d8f145e5a0492838c951dad5d96716c71':
  Use ext4 file system for generic_x86 userdata partition