tag badce31e302d28bd4f9d5df68c1ec6c63447cb24
tagger The Android Open Source Project <initial-contribution@android.com> Tue Jul 14 15:05:52 2020 -0700
object 31b8f380dbad17e36fa43f436fbb35b837ac4bc1

Android R Beta 2

commit 31b8f380dbad17e36fa43f436fbb35b837ac4bc1
author Jaegeuk Kim <jaegeuk@google.com> Thu Jul 09 18:23:24 2020 -0700
committer Jaegeuk Kim <jaegeuk@google.com> Thu Jul 09 18:26:44 2020 -0700
tree 65b356c829447289053471a35aaa0205a264aaa4
parent 471bb35b424490b5262d44c542b9ea5f23cc67a7
parent d03cab6c93d634fe746f55302bbcd28a9eb545a7

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

* aosp/upstream-master:
  fsck.f2fs: Split build_segment_manager() to speed up auto-fix
  dump.f2fs: dump symlink contents in lost_found
  fsck.f2fs: Fix slow fsck in auto-fix mode
  fsck: prevent buffer overrun in quota code
  f2fs-tools: set cold flag for non-dir node
  lib: pass all needed include paths to libf2fs
  lib: use ${libuuid_LIBS} instead of -luuid everywhere
  lib: fix include path for blkid.h
  lib: fix include path for uuid.h
  libf2fs: fix build error on Windows

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