tree 5c25b049823a9b61c7cc29a0532653547e5b3fcd
parent 3f90ad51399a9bcaaec25408e915224458c268b5
parent d4c88f6512340196775bb324f5c00e30dcffd3cb
author android-build-team Robot <android-build-team-robot@google.com> 1525121682 -0700
committer android-build-merger <android-build-merger@google.com> 1525121682 -0700

Merge "Adding VENDOR_SECURITY_PATCH to vendor partition build.prop" into pi-dev
am: d4c88f6512

Change-Id: I35b987b75f6bd7c9d07aea0c35cfb5571bddc717