tag d9c833574c7b3e72b99619490f15442cb6e43d65
tagger The Android Open Source Project <initial-contribution@android.com> Tue May 18 12:09:24 2021 -0700
object bcc3a2212966cc608b2850a3fde54893b2bfaa6d

Android S Beta 1

commit bcc3a2212966cc608b2850a3fde54893b2bfaa6d
author Jaegeuk Kim <jaegeuk@google.com> Sat Apr 24 21:26:33 2021 -0700
committer Jaegeuk Kim <jaegeuk@google.com> Sat Apr 24 21:28:42 2021 -0700
tree 44495b1bb969cc2e16495df26c47acd5524b575d
parent 83d2d91d583139459adb315aee47512a6caeb8ae
parent 1531853eb72b335c488171dd0803e9c417de7e1f

Merge remote-tracking branch 'aosp/upstream-master' into aosp

* aosp/upstream-master:
  f2fs_io: Add get file name encryption mode
  f2fs-tool: increase debug level from 0 to 1 in migrate_block
  resize.f2fs: fix to check free space before shrink
  resize.f2fs: fix wrong sit/nat bitmap during rebuild_checkpoint()
  resize.f2fs: add force option to rewrite broken calculation
  resize.f2fs: fix wrong ovp calculation
  Add -P option to preserve file owner
  libf2fs: fix memory leak caused by get_rootdev()
  mkfs.f2fs: add VM disk files to hot data types

Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: I63d16dfdb5d31e9ee15e2c26e9ab5c0c63edb947