[automerger skipped] Disable vendor path check for mainline variants am: 2c5def62dc
-s ours
am:be1b86480d
-s ours am skip reason: change_id I607781ce7c6299cbc98c54c683d04db3b65c2e21 with SHA142127e0213
is in history Change-Id: I0f4e1f044c829332caa4bc79e95ba244bee1aef3
This commit is contained in: