Merge cherrypicks of [19273417, 19267010, 19292028, 19294568, 19296863, 19297073, 19341846, 19341787] into tm-release.
Change-Id: I8b59ebe8d9c667c3568cf4c969bff7b37b6186ae
diff --git a/device-oriole.mk b/device-oriole.mk
index 1346e8c..b652ae5 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -168,7 +168,7 @@
# Increment the SVN for any official public releases
PRODUCT_VENDOR_PROPERTIES += \
- ro.vendor.build.svn=32
+ ro.vendor.build.svn=36
# Set support hide display cutout feature
PRODUCT_PRODUCT_PROPERTIES += \
diff --git a/device-raven.mk b/device-raven.mk
index bbc8733..09900d8 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -178,7 +178,7 @@
# Increment the SVN for any official public releases
PRODUCT_VENDOR_PROPERTIES += \
- ro.vendor.build.svn=32
+ ro.vendor.build.svn=36
# Set support hide display cutout feature
PRODUCT_PRODUCT_PROPERTIES += \