OSDN Git Service

[automerger skipped] Merge "Merge Android R" am: 141c2027e2 -s ours
authorXin Li <delphij@google.com>
Fri, 11 Sep 2020 00:40:18 +0000 (00:40 +0000)
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Fri, 11 Sep 2020 00:40:18 +0000 (00:40 +0000)
commit789d1d0866b2d5772be3fc097cd7713201b20f9b
treeb06929be53a14679f98e262e210da1bf9b540dcc
parent8743ef4ea6046d11d0b1e8cb34b58675fcbc8cc7
parent141c2027e240e4a30988645532f0d199e34174ae
[automerger skipped] Merge "Merge Android R" am: 141c2027e2 -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: I78dff452b759e863b082f44b76fb5ae9a83cb704