tree 968288cf84a23ccd127224435961f31fb4d111f2
parent 7ebd23d5cacb949311fb6f741cb4f5c8063dd8cf
parent 766baba9d08c13ec364f20ad70ca36303f186038
author Ken Sumrall <ksumrall@android.com> 1339537947 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339537947 -0700

am 766baba9: am a8948fce: Revert "Better fix for marking fs err in superblock if err set in journal superblock."

* commit '766baba9d08c13ec364f20ad70ca36303f186038':
  Revert "Better fix for marking fs err in superblock if err set in journal superblock."