Merge cherrypicks of [14988379, 14988380, 14984749, 14988513, 14988333, 14988334, 14988398, 14985920, 14988097, 14988381, 14985921, 14988891, 14987186, 14988382, 14989110, 14988514, 14988515, 14988652, 14988653, 14988654, 14988399, 14988400, 14988401, 14984579, 14987188, 14988532, 14988533, 14988402, 14983067, 14983068, 14974447, 14974448, 14988656, 14988535, 14988536, 14988537, 14988538, 14988539, 14988540, 14988541] into rvc-qpr3-release
Change-Id: Ie361a28cc00c6e79d09abd66974d9d51032300a5
diff --git a/device.mk b/device.mk
index 1c6d104..c67c793 100644
--- a/device.mk
+++ b/device.mk
@@ -880,7 +880,7 @@
# Increment the SVN for any official public releases
PRODUCT_PROPERTY_OVERRIDES += \
- ro.vendor.build.svn=40
+ ro.vendor.build.svn=41
# Vendor verbose logging default property
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
diff --git a/sargo/overlay_packages/SettingsOverlayG020E/res/drawable/regulatory.png b/sargo/overlay_packages/SettingsOverlayG020E/res/drawable/regulatory_info.png
similarity index 100%
rename from sargo/overlay_packages/SettingsOverlayG020E/res/drawable/regulatory.png
rename to sargo/overlay_packages/SettingsOverlayG020E/res/drawable/regulatory_info.png
Binary files differ
