OSDN Git Service

[automerger skipped] Merge "Merge Android R" am: 141c2027e2 -s ours am: 789d1d0866...
authorXin Li <delphij@google.com>
Fri, 11 Sep 2020 21:27:34 +0000 (21:27 +0000)
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Fri, 11 Sep 2020 21:27:34 +0000 (21:27 +0000)
commitabde63edc1253f050034933592c616b15944c98a
tree72753ea796559949456ca27ada59e37f608edb41
parent6239996bfa1956309045a01728a78805c6e4ab0b
parent6167310291c0696bbc8aa0f28de447cd3f65c7c0
[automerger skipped] Merge "Merge Android R" am: 141c2027e2 -s ours am: 789d1d0866 -s ours am: a56f7d2608 -s ours am: 2866b9d5a8 -s ours am: 6167310291 -s ours

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: Ie8209d16085789a1b1acabab3543a5f380b25c05