summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2019-11-22 10:55:56 -0800
committerXin Li <delphij@google.com>2019-11-22 13:57:29 -0800
commit62c7ec34ed72fb256f27d2c13d686b653262dee3 (patch)
treea6b2ddac9ac676786f7f37a877331e91f23a40df
parent6f3503d6c93a7a257c5dea0b0726ad38d4fd5369 (diff)
parentfff90a6ed2a904fbf6719e6ffebe08d6ddde362a (diff)
downloadbonito-temp_b_145570283.tar.gz
Merge QQ1A.191205.011 into stage-aosp-mastertemp_b_145570283
Bug: 144955631 Merged-In: Id1ff200689254197d6d23c5e207106c0764b3f42 Change-Id: Ie0dfb1ac4a0bcfb156beea78eb475eba00907d36
-rw-r--r--device.mk2
-rw-r--r--overlay/packages/apps/Settings/res/drawable/regulatory_info_g020a.pngbin144940 -> 143429 bytes
-rw-r--r--overlay/packages/apps/Settings/res/drawable/regulatory_info_g020b.pngbin405019 -> 407182 bytes
-rw-r--r--overlay/packages/apps/Settings/res/drawable/regulatory_info_g020d.pngbin255952 -> 253840 bytes
-rw-r--r--sargo/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020e.pngbin142159 -> 142665 bytes
-rw-r--r--sargo/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020e_vn.pngbin78844 -> 142898 bytes
-rw-r--r--sargo/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020f.pngbin413353 -> 399022 bytes
-rw-r--r--sargo/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020h.pngbin254100 -> 252761 bytes
8 files changed, 1 insertions, 1 deletions
diff --git a/device.mk b/device.mk
index 594c932b..6d4195ba 100644
--- a/device.mk
+++ b/device.mk
@@ -862,4 +862,4 @@ PRODUCT_PRODUCT_PROPERTIES += \
# Increment the SVN for any official public releases
PRODUCT_PROPERTY_OVERRIDES += \
- ro.vendor.build.svn=12
+ ro.vendor.build.svn=15
diff --git a/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020a.png b/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020a.png
index d397d5d2..0d5a1b56 100644
--- a/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020a.png
+++ b/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020a.png
Binary files differ
diff --git a/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020b.png b/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020b.png
index 59c73b54..7b4847a1 100644
--- a/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020b.png
+++ b/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020b.png
Binary files differ
diff --git a/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020d.png b/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020d.png
index dc6d0dcd..e9ecf8ef 100644
--- a/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020d.png
+++ b/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020d.png
Binary files differ
diff --git a/sargo/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020e.png b/sargo/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020e.png
index c66be537..2868014b 100644
--- a/sargo/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020e.png
+++ b/sargo/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020e.png
Binary files differ
diff --git a/sargo/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020e_vn.png b/sargo/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020e_vn.png
index b72a5580..cb342e03 100644
--- a/sargo/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020e_vn.png
+++ b/sargo/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020e_vn.png
Binary files differ
diff --git a/sargo/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020f.png b/sargo/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020f.png
index 35c78dd0..4155dda2 100644
--- a/sargo/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020f.png
+++ b/sargo/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020f.png
Binary files differ
diff --git a/sargo/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020h.png b/sargo/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020h.png
index 35c7c4a1..6c837efb 100644
--- a/sargo/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020h.png
+++ b/sargo/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020h.png
Binary files differ