Merge changes I513e1111,Ie1b1f439

* changes:
  Disable phone number formatting for Argentina only (MCC = 722).
  Implement logic for unblocking a number from the new call log's bottom sheet.

1 files changed, 0 insertions, 21 deletions

diff --git a/java/com/android/dialer/oem/res/values-mcc344/motorola_config.xml b/java/com/android/dialer/oem/res/values-mcc344/motorola_config.xml
deleted file mode 100644
index bfe0cb767..000000000
--- a/java/com/android/dialer/oem/res/values-mcc344/motorola_config.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2018 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-  -->
-
-<resources>
-  <!-- Flag to control whether to disable phone number formatting -->
-  <bool name="motorola_disable_phone_number_formatting">true</bool>
-</resources>