tree 9d6ac056b78d8099f7c1df2d93317af19b5817f0
parent 4ab07dfcd357719192b20fe9525e441fae03b29d
parent d6f506e78304e4d3bfa3e55865dcf8d51684f6df
author Jin Qian <jinqian@google.com> 1494014016 +0000
committer android-build-merger <android-build-merger@google.com> 1494014016 +0000

Merge "recovery: update mkfs.f2fs args to match f2fs-tools 1.8.0" am: f347c1abca
am: d6f506e783

Change-Id: I3f07419c0ccb380770220b201981b0fc7c88cc8f