tree 8049d0ab19a214f063b149f19408d5b1259e2a47
parent 5827ea95c805f900a85054105ed519b2122fcbc8
parent 7d360b3bc2e2ed19e5d7f64fe2e2b20e2dbcdee9
author Martin Stjernholm <mast@google.com> 1663164197 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1663164197 +0000

[automerger skipped] Allow the vendor partition to be in /system/vendor. am: 7d360b3bc2 -s ours

am skip reason: Merged-In I9267c008db644ebe38f6215d3b692b98dd88ee34 with SHA-1 7eacdf8e53 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/art/+/19946224

Change-Id: Id56bd11817d2800e3bd088f72d6514b790e0fc74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>