tree f8bc98553785b0d1ab524b0aa0d62cc4e6a32662
parent 15651fd8f0fc72b0f377b6da3d2aa51eac2a9380
parent 15e957d3f60d61dff48c5f99447300e6ba320521
author Tao Bao <tbao@google.com> 1536082125 -0700
committer android-build-merger <android-build-merger@google.com> 1536082125 -0700

Merge "support mounting f2fs in recovery mode" am: a062fae9d7
am: 15e957d3f6

Change-Id: I53bd70ae87fc69ae82dfbefe48fa42d60ef438eb