commit 4632dabb4e1306d28240fe79d07b72f0d626d6d1
author android-build-team Robot <android-build-team-robot@google.com> Fri Jul 27 18:47:52 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri Jul 27 18:47:52 2018 +0000
tree 530786994db4ac97f59d5b55b512b222cd31cebf
parent e96c281fd9b051ca7f75075d9d2e614ca7a3cdbc
parent 60983c25c373c6f9c21fc1ae7b45007caedc0254

Merge cherrypicks of [4647037, 4647038, 4647883, 4647039, 4647933, 4648530, 4648550, 4648551, 4648552, 4648553, 4646931, 4646932, 4646933, 4646934, 4648391, 4647976, 4647977, 4647978, 4647526, 4646972, 4646935, 4646936, 4646937, 4646938, 4646939, 4646940, 4646941, 4648392, 4647509, 4648630, 4648631, 4647934] into pi-release-2

Change-Id: I66226810c555620cb6086c6d008cc0a69da161b9

device.mk

diff --git a/device.mk b/device.mk
index fe27cf6..602d024 100755
--- a/device.mk
+++ b/device.mk
@@ -36,7 +36,7 @@
 
 # Set the SVN for the targeted MR release
 PRODUCT_PROPERTY_OVERRIDES += \
-    ro.vendor.build.svn=17
+    ro.vendor.build.svn=18
 
 # Enforce privapp-permissions whitelist
 PRODUCT_PROPERTY_OVERRIDES += \