tree ce72211261d30b0098eca236b77a924a6cbe43b3
parent 6b78fad147c772075eae5cfc25f5a50748bc4015
parent 2713be91a84078e8b0b9b755ce17881b750e85a7
author Nick Kralevich <nnk@google.com> 1373653215 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1373653215 -0700

am 2713be91: am fb1c9cf6: Merge "use ext4 instead of yaffs"

* commit '2713be91a84078e8b0b9b755ce17881b750e85a7':
  use ext4 instead of yaffs