[automerger skipped] Merge "Adding VENDOR_SECURITY_PATCH to vendor partition build.prop"

am: 7654023bcd  -s ours

Change-Id: I013772842886db3d2607976ce8e3e217b54d85b7
This commit is contained in:
Max Bires 2018-07-30 20:43:47 -07:00 committed by android-build-merger
commit 30d2628e03

Diff Content Not Available