[automerger skipped] Merge "Adding VENDOR_SECURITY_PATCH to vendor partition build.prop" am: 7654023bcd -s ours

am: 30d2628e03  -s ours

Change-Id: Ib34927c397c75b17c2cc6f2389fbceb1f351cdf7
This commit is contained in:
Max Bires 2018-07-30 20:48:57 -07:00 committed by android-build-merger
commit 0acf7b6c60

Diff Content Not Available