commit 4b4a2247bf5f8959f18ace6aa6b6d1890f29d93c
author Chavi Weingarten <chaviw@google.com> Mon Apr 19 16:30:45 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 19 16:30:45 2021 +0000
tree 5be17de0e085e0634d49f0a488b02d86e505686a
parent 22575e1ea0074079d117d0cf0f2c2b49fcd5d98a
parent 525881a6d9273a4839c1d8b9a7656d644b049a0e

Merge "Updated DisplayHash APIs" into sc-dev

Android.bp

diff --git a/Android.bp b/Android.bp
index 08e3b73..bc68139 100644
--- a/Android.bp
+++ b/Android.bp
@@ -58,6 +58,8 @@
     min_sdk_version: "30",
     certificate: "platform",
     optimize: {
+        optimize: true,
+        proguard_compatibility: false,
         proguard_flags_files: ["proguard.proguard"],
     },
     privileged: true,

java/res/values-eu/strings.xml

diff --git a/java/res/values-eu/strings.xml b/java/res/values-eu/strings.xml
index 172cdf8..76e228b 100644
--- a/java/res/values-eu/strings.xml
+++ b/java/res/values-eu/strings.xml
@@ -16,5 +16,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_assistant" msgid="9160940242838910547">"Android-en jakinarazpen doigarriak"</string>
+    <string name="notification_assistant" msgid="9160940242838910547">"Android-en jakinarazpen egokituak"</string>
 </resources>