tree ff4e9acc244729d816f6dfe5925a6466c496d04b
parent efcd98da32e0c7add2b8974c3f1be919defd14a6
parent c418bfeae21a12df2a448217c77c67cac5eff0e0
author Jaegeuk Kim <jaegeuk@google.com> 1510628461 +0000
committer android-build-merger <android-build-merger@google.com> 1510628461 +0000

Merge "recovery: format f2fs with encrypt/quota" am: d4b6e25fdd
am: c418bfeae2

Change-Id: I2a040a11a71868915658958dbecf4bdd23c25e0c