OSDN Git Service

[automerger skipped] Merge "Merge Android R" am: 141c2027e2 -s ours am: 789d1d0866...
authorXin Li <delphij@google.com>
Fri, 11 Sep 2020 03:33:34 +0000 (03:33 +0000)
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Fri, 11 Sep 2020 03:33:34 +0000 (03:33 +0000)
am skip reason: Change-Id I477d2dfba05718c829fdb2099248a8baba1125ab with SHA-1 8743ef4ea6 is in history

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1422563

Change-Id: Ib0d73f9b471d4cb9834da5c25aaeae2a53ade075


Trivial merge