From 9050823ccf6f512e06ad65c8a741cb17cbc4a833 Mon Sep 17 00:00:00 2001
From: Eric Erfanian <erfanian@google.com>
Date: Fri, 24 Mar 2017 09:31:16 -0700
Subject: Update AOSP Dialer source from internal google3 repository at
 cl/151128062

Test: make, treehugger

This CL updates the AOSP Dialer source with all the changes that have
gone into the private google3 repository. This includes all the
changes from cl/150756069 (3/21/2017) to cl/151128062 (3/24/2017).

Notable this release:
- Explicitly enumerate host and target dependencies.
- Update proguard flag references.

This goal of these drops is to keep the AOSP source in sync with the
internal google3 repository. Currently these sync are done by hand
with very minor modifications to the internal source code.
See the Android.mk file for list of modifications.
Our current goal is to do frequent drops (daily if possible) and
eventually switched to an automated process.

Bug: 33210202 36511925

Addresses
33210202 - Proguard support
36511925 - Compiler warnings when building against platform sdk

Change-Id: I448ec3b3f2358886859cf7a4ef76a8fcef3244ae
---
 java/com/android/contacts/common/res/values-sr/strings.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'java/com/android/contacts/common/res/values-sr/strings.xml')

diff --git a/java/com/android/contacts/common/res/values-sr/strings.xml b/java/com/android/contacts/common/res/values-sr/strings.xml
index ca2dc1ce2..9801a29a3 100644
--- a/java/com/android/contacts/common/res/values-sr/strings.xml
+++ b/java/com/android/contacts/common/res/values-sr/strings.xml
@@ -214,7 +214,6 @@
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Прво име"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"Прво презиме"</string>
     <string name="default_editor_account" msgid="1826578934497338822">"Подразумевани налог за нове контакте"</string>
-    <string name="sync_contact_metadata_title" msgid="6586379532092486928">"Синхронизуј метаподатке контаката [DOGFOOD]"</string>
     <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"Синхронизујте метаподатке контаката"</string>
     <string name="setting_about" msgid="5253319937596745755">"О Контактима"</string>
     <string name="activity_title_settings" msgid="2398428034981372932">"Подешавања"</string>
-- 
cgit v1.2.3