tree 534fcd1cdb1ecca72527f340f74403d956b89e6e
parent a8c010bfb047e93d5ab3cf42ced60b2e8371f82f
parent 7f223030ffe1a24600b09f52f17209f42dc0dcc0
author Mark Salyzyn <salyzyn@google.com> 1429209951 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429209951 +0000

am 7f223030: Merge "f2fs_utils: fix build break in static_sdk_tools"

* commit '7f223030ffe1a24600b09f52f17209f42dc0dcc0':
  f2fs_utils: fix build break in static_sdk_tools