tree c51eaf9e3b75f5ab82f248a478f9edaf764f7144
parent a9f78c1b40171815c2834d1115de2c923228d84e
parent b2cc45fe711dc42c8c0444584b2513ac59b3ad3b
author Jeff Sharkey <jsharkey@android.com> 1432852485 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1432852485 +0000

am b2cc45fe: Add f2fs to blkid.

* commit 'b2cc45fe711dc42c8c0444584b2513ac59b3ad3b':
  Add f2fs to blkid.