OSDN Git Service

[automerger skipped] Restore historical behavior with fsck_msdos (always accept fixes...
authorXin Li <delphij@google.com>
Thu, 27 Jun 2019 18:39:45 +0000 (11:39 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 27 Jun 2019 18:39:45 +0000 (11:39 -0700)
commitf1ba84f9444ac4d66d9d6af0d6d92e300c0beda7
tree40c5ba329bccbbfebfbb58674fd81a14720878a9
parent949263e7587c2dce832b057717d9c70863e59b73
parentadeb6833b2032ddd68d0635d3d70d0647572f3ce
[automerger skipped] Restore historical behavior with fsck_msdos (always accept fixes). am: 3601f4790b -s ours am: 0092301976 -s ours
am: adeb6833b2 -s ours
am skip reason: change_id I1d50a7e52fda34e59eb6f051c7fde115a6cd5255 with SHA1 3d3a9a7f1c is in history

Change-Id: I79ea3adee533e756083de42c6da72f5be0b74ac3