OSDN Git Service

[automerger skipped] Restore historical behavior with fsck_msdos (always accept fixes).
authorXin Li <delphij@google.com>
Wed, 26 Jun 2019 22:09:02 +0000 (15:09 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 26 Jun 2019 22:09:02 +0000 (15:09 -0700)
am: 3601f4790b -s ours
am skip reason: change_id I1d50a7e52fda34e59eb6f051c7fde115a6cd5255 with SHA1 3d3a9a7f1c is in history

Change-Id: Ib97568c9eaecb3c52e4703f7d14a8235b9cc0cc4


Trivial merge